Autogenerated HTML docs for v1.6.5-rc0

1 files changed, 16 insertions, 6 deletions

diff --git a/git-am.html b/git-am.html
index aac18d3a4..001d975db 100644
--- a/git-am.html
+++ b/git-am.html
@@ -325,7 +325,7 @@ git-am(1) Manual Page
          [--3way] [--interactive] [--committer-date-is-author-date]

          [--ignore-date] [--ignore-space-change | --ignore-whitespace]

          [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]

-         [--reject] [-q | --quiet]

+         [--reject] [-q | --quiet] [--scissors]

          [<mbox> | <Maildir>…]

 <em>git am</em> (--skip | --resolved | --abort)</div></div>

 </div>

@@ -372,6 +372,18 @@ current branch.</p></div>
 </p>

 </dd>

 <dt>

+-c

+</dt>

+<dt>

+--scissors

+</dt>

+<dd>

+<p>

+        Remove everything in body before a scissors line (see

+        <a href="git-mailinfo.html">git-mailinfo(1)</a>).

+</p>

+</dd>

+<dt>

 -q

 </dt>

 <dt>

@@ -543,10 +555,8 @@ of the message.  The "Subject: " line is used as the title of
 the commit, after stripping common prefix "[PATCH &lt;anything&gt;]".

 The "Subject: " line is supposed to concisely describe what the

 commit is about in one line of text.</p></div>

-<div class="para"><p>"From: " and "Subject: " lines starting the body (the rest of the

-message after the blank line terminating the RFC2822 headers)

-override the respective commit author name and title values taken

-from the headers.</p></div>

+<div class="para"><p>"From: " and "Subject: " lines starting the body override the respective

+commit author name and title values taken from the headers.</p></div>

 <div class="para"><p>The commit message is formed by the title taken from the

 "Subject: ", a blank line and the body of the message up to

 where the patch begins.  Excess whitespace at the end of each

@@ -618,7 +628,7 @@ errors in the "From:" lines).</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-08-22 05:10:25 UTC

+Last updated 2009-09-08 00:54:59 UTC

 </div>

 </div>

 </body>