Autogenerated HTML docs for v1.9.1-506-g7bf27

1 files changed, 9 insertions, 10 deletions

diff --git a/git-merge.html b/git-merge.html
index 0335aa738..e59c60430 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -751,7 +751,7 @@ git-merge(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]

-        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]

+        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;key-id&gt;]]

         [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [&lt;commit&gt;&#8230;]

 <em>git merge</em> &lt;msg&gt; HEAD &lt;commit&gt;&#8230;

 <em>git merge</em> --abort</pre>

@@ -916,14 +916,13 @@ merge.</p></div>
 </dt>

 <dd>

 <p>

-        Produce the working tree and index state as if a real

-        merge happened (except for the merge information),

-        but do not actually make a commit or

-        move the <tt>HEAD</tt>, nor record <tt>$GIT_DIR/MERGE_HEAD</tt> to

-        cause the next <tt>git commit</tt> command to create a merge

-        commit.  This allows you to create a single commit on

-        top of the current branch whose effect is the same as

-        merging another branch (or more in case of an octopus).

+        Produce the working tree and index state as if a real merge

+        happened (except for the merge information), but do not actually

+        make a commit, move the <tt>HEAD</tt>, or record <tt>$GIT_DIR/MERGE_HEAD</tt>

+        (to cause the next <tt>git commit</tt> command to create a merge

+        commit).  This allows you to create a single commit on top of

+        the current branch whose effect is the same as merging another

+        branch (or more in case of an octopus).

 </p>

 <div class="paragraph"><p>With --no-squash perform the merge and commit the result. This

 option can be used to override --squash.</p></div>

@@ -1828,7 +1827,7 @@ branch.&lt;name&gt;.mergeoptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-10-18 15:11:10 PDT

+Last updated 2014-04-08 12:47:26 PDT

 </div>

 </div>

 </body>