Autogenerated HTML docs for v1.7.11.2-249-g31c79

1 files changed, 18 insertions, 2 deletions

diff --git a/git-apply.html b/git-apply.html
index 17c59d42b..721cdf0d1 100644
--- a/git-apply.html
+++ b/git-apply.html
@@ -583,7 +583,7 @@ git-apply(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

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

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

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

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

           [-p&lt;n&gt;] [-C&lt;n&gt;] [--inaccurate-eof] [--recount] [--cached]

@@ -684,6 +684,22 @@ and does not require them to be in a git repository.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+-3

+</dt>

+<dt class="hdlist1">

+--3way

+</dt>

+<dd>

+<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 available locally, possibly leaving the

+        conflict markers in the files in the working tree for the user to

+        resolve.  This option implies the <tt>--index</tt> option, and is incompatible

+        with the <tt>--reject</tt> and the <tt>--cached</tt> options.

+</p>

+</dd>

+<dt class="hdlist1">

 --build-fake-ancestor=&lt;file&gt;

 </dt>

 <dd>

@@ -994,7 +1010,7 @@ subdirectory is checked and (if possible) updated.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2012-07-15 22:27:35 PDT

 </div>

 </div>

 </body>