Autogenerated HTML docs for v2.5.0

1 files changed, 3 insertions, 8 deletions

diff --git a/git-am.html b/git-am.html
index 09b51bc5b..252dca93d 100644
--- a/git-am.html
+++ b/git-am.html
@@ -749,7 +749,7 @@ git-am(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git am</em> [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]

-         [--[no-]3way] [--interactive] [--committer-date-is-author-date]

+         [--3way] [--interactive] [--committer-date-is-author-date]

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

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

          [--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]

@@ -911,17 +911,12 @@ default.   You can use <code>--no-utf8</code> to override this.</p></div>
 <dt class="hdlist1">

 --3way

 </dt>

-<dt class="hdlist1">

---no-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. <code>--no-3way</code> can be used to override

-        am.threeWay configuration variable. For more information,

-        see am.threeWay in <a href="git-config.html">git-config(1)</a>.

+        available locally.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1155,7 +1150,7 @@ information.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-06-24 14:09:45 PDT

+Last updated 2015-07-27 13:41:41 PDT

 </div>

 </div>

 </body>