Autogenerated HTML docs for v1.5.6.1-156-ge903b

1 files changed, 20 insertions, 10 deletions

diff --git a/git-apply.html b/git-apply.html
index 975846595..728322578 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -273,10 +273,10 @@ git-apply(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index]

+<div class="content"><em>git apply</em> [--stat] [--numstat] [--summary] [--check] [--index]

           [--apply] [--no-add] [--build-fake-ancestor &lt;file&gt;] [-R | --reverse]

           [--allow-binary-replacement | --binary] [--reject] [-z]

-          [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]

+          [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]

           [--whitespace=&lt;nowarn|warn|fix|error|error-all&gt;]

           [--exclude=PATH] [--verbose] [&lt;patch&gt;&#8230;]</div></div>

 </div>

@@ -368,7 +368,7 @@ and a work tree.</p>
 </dt>

 <dd>

 <p>

-        Newer git-diff output has embedded <em>index information</em>

+        Newer <tt>git-diff</tt> output has embedded <em>index information</em>

         for each blob to help identify the original version that

         the patch applies to.  When this flag is given, and if

         the original versions of the blobs is available locally,

@@ -393,7 +393,7 @@ the information is read from the current index instead.</p>
 </dt>

 <dd>

 <p>

-        For atomicity, <a href="git-apply.html">git-apply(1)</a> by default fails the whole patch and

+        For atomicity, <tt>git-apply</tt> by default fails the whole patch and

         does not touch the working tree when some of the hunks

         do not apply.  This option makes it apply

         the parts of the patch that are applicable, and leave the

@@ -437,7 +437,7 @@ the information is read from the current index instead.</p>
 </dt>

 <dd>

 <p>

-        By default, <a href="git-apply.html">git-apply(1)</a> expects that the patch being

+        By default, <tt>git-apply</tt> expects that the patch being

         applied is a unified diff with at least one line of context.

         This provides good safety measures, but breaks down when

         applying a diff generated with --unified=0. To bypass these

@@ -452,7 +452,7 @@ discouraged.</p>
 <dd>

 <p>

         If you use any of the options marked "Turns off

-        <em>apply</em>" above, <a href="git-apply.html">git-apply(1)</a> reads and outputs the

+        <em>apply</em>" above, <tt>git-apply</tt> reads and outputs the

         information you asked without actually applying the

         patch.  Give this flag after those flags to also apply

         the patch.

@@ -508,8 +508,8 @@ discouraged.</p>
         considered whitespace errors.

 </p>

 <p>By default, the command outputs warning messages but applies the patch.

-When <a href="git-apply.html">git-apply(1)</a> is used for statistics and not applying a

-patch, it defaults to <tt>nowarn</tt>.</p>

+When <tt>git-apply is used for statistics and not applying a

+patch, it defaults to `nowarn</tt>.</p>

 <p>You can use different <tt>&lt;action&gt;</tt> to control this

 behavior:</p>

 <ul>

@@ -570,6 +570,16 @@ behavior:</p>
         additional information to be reported.

 </p>

 </dd>

+<dt>

+--recount

+</dt>

+<dd>

+<p>

+        Do not trust the line counts in the hunk headers, but infer them

+        by inspecting the patch (e.g. after editing the patch without

+        adjusting the hunk headers appropriately).

+</p>

+</dd>

 </dl>

 </div>

 <h2>Configuration</h2>

@@ -588,7 +598,7 @@ apply.whitespace
 </div>

 <h2>Submodules</h2>

 <div class="sectionbody">

-<p>If the patch contains any changes to submodules then <a href="git-apply.html">git-apply(1)</a>

+<p>If the patch contains any changes to submodules then <tt>git-apply</tt>

 treats these changes as follows.</p>

 <p>If --index is specified (explicitly or implicitly), then the submodule

 commits must match the index exactly for the patch to apply.  If any

@@ -613,7 +623,7 @@ subdirectory is checked and (if possible) updated.</p>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 08-Jun-2008 22:46:18 UTC

+Last updated 02-Jul-2008 03:01:32 UTC

 </div>

 </div>

 </body>