Autogenerated HTML docs for v1.7.9.2-302-g3724c

1 files changed, 19 insertions, 15 deletions

diff --git a/git-merge.html b/git-merge.html
index a94f9eb39..96d202672 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -674,17 +674,31 @@ set to <tt>no</tt> at the beginning of them.</p></div>
 <dt class="hdlist1">

 --ff

 </dt>

+<dd>

+<p>

+        When the merge resolves as a fast-forward, only update the branch

+        pointer, without creating a merge commit.  This is the default

+        behavior.

+</p>

+</dd>

 <dt class="hdlist1">

 --no-ff

 </dt>

 <dd>

 <p>

-        Do not generate a merge commit if the merge resolved as

-        a fast-forward, only update the branch pointer. This is

-        the default behavior of git-merge.

+        Create a merge commit even when the merge resolves as a

+        fast-forward.

+</p>

+</dd>

+<dt class="hdlist1">

+--ff-only

+</dt>

+<dd>

+<p>

+        Refuse to merge and exit with a non-zero status unless the

+        current <tt>HEAD</tt> is already up-to-date or the merge can be

+        resolved as a fast-forward.

 </p>

-<div class="paragraph"><p>With --no-ff Generate a merge commit even if the merge

-resolved as a fast-forward.</p></div>

 </dd>

 <dt class="hdlist1">

 --log[=&lt;n&gt;]

@@ -739,16 +753,6 @@ merge.</p></div>
 option can be used to override --squash.</p></div>

 </dd>

 <dt class="hdlist1">

---ff-only

-</dt>

-<dd>

-<p>

-        Refuse to merge and exit with a non-zero status unless the

-        current <tt>HEAD</tt> is already up-to-date or the merge can be

-        resolved as a fast-forward.

-</p>

-</dd>

-<dt class="hdlist1">

 -s &lt;strategy&gt;

 </dt>

 <dt class="hdlist1">