Autogenerated HTML docs for v1.5.2-rc3-39-gaf9b

1 files changed, 24 insertions, 21 deletions

diff --git a/git-am.html b/git-am.html
index f2a433f82..9984b7728 100644
--- a/git-am.html
+++ b/git-am.html
@@ -273,8 +273,9 @@ git-am(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--utf8 | --no-utf8] [--binary] [--3way]

-         [--interactive] [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]

+<div class="content"><em>git-am</em> [--signoff] [--dotest=&lt;dir&gt;] [--keep] [--utf8 | --no-utf8]

+         [--3way] [--interactive] [--binary]

+         [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;]

          &lt;mbox&gt;&#8230;

 <em>git-am</em> [--skip | --resolved]</div></div>

 </div>

@@ -329,7 +330,7 @@ current branch.</p>
 <p>

         Pass <tt>-u</tt> flag to <tt>git-mailinfo</tt> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).

         The proposed commit log message taken from the e-mail

-        are re-coded into UTF-8 encoding (configuration variable

+        is re-coded into UTF-8 encoding (configuration variable

         <tt>i18n.commitencoding</tt> can be used to specify project's

         preferred encoding if it is not UTF-8).

 </p>

@@ -346,15 +347,6 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </p>

 </dd>

 <dt>

--b, --binary

-</dt>

-<dd>

-<p>

-        Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>

-        (see <a href="git-apply.html">git-apply(1)</a>).

-</p>

-</dd>

-<dt>

 -3, --3way

 </dt>

 <dd>

@@ -362,16 +354,16 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
         When the patch does not apply cleanly, fall back on

         3-way merge, if the patch records the identity of blobs

         it is supposed to apply to, and we have those blobs

-        locally.

+        available locally.

 </p>

 </dd>

 <dt>

---skip

+-b, --binary

 </dt>

 <dd>

 <p>

-        Skip the current patch.  This is only meaningful when

-        restarting an aborted patch.

+        Pass <tt>--allow-binary-replacement</tt> flag to <tt>git-apply</tt>

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

 </p>

 </dd>

 <dt>

@@ -379,7 +371,8 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>

 <dd>

 <p>

-        This flag is passed to the <tt>git-apply</tt> program that applies

+        This flag is passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>)

+        program that applies

         the patch.

 </p>

 </dd>

@@ -388,7 +381,8 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>

 <dd>

 <p>

-        These flags are passed to the <tt>git-apply</tt> program that applies

+        These flags are passed to the <tt>git-apply</tt> (see <a href="git-apply.html">git-apply(1)</a>)

+        program that applies

         the patch.

 </p>

 </dd>

@@ -397,7 +391,16 @@ default.   You could use <tt>--no-utf8</tt> to override this.</p>
 </dt>

 <dd>

 <p>

-        Run interactively, just like git-applymbox.

+        Run interactively.

+</p>

+</dd>

+<dt>

+--skip

+</dt>

+<dd>

+<p>

+        Skip the current patch.  This is only meaningful when

+        restarting an aborted patch.

 </p>

 </dd>

 <dt>

@@ -471,7 +474,7 @@ recover from this in one of two ways:</p>
 <ol>

 <li>

 <p>

-skip the current one by re-running the command with <em>--skip</em>

+skip the current patch by re-running the command with <em>--skip</em>

   option.

 </p>

 </li>

@@ -506,7 +509,7 @@ names.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 17-Apr-2007 08:27:39 UTC

+Last updated 15-May-2007 03:12:35 UTC

 </div>

 </div>

 </body>