Autogenerated HTML docs for v2.23.0-385-gbc129

1 files changed, 15 insertions, 20 deletions

diff --git a/git-merge.html b/git-merge.html
index d60cb2c9a..5361dff6e 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -863,33 +863,28 @@ set to <code>no</code> 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>

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

-        fast-forward.  This is the default behaviour when merging an

-        annotated (and possibly signed) tag that is not stored in

-        its natural place in <em>refs/tags/</em> hierarchy.

-</p>

-</dd>

 <dt class="hdlist1">

 --ff-only

 </dt>

 <dd>

 <p>

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

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

-        resolved as a fast-forward.

-</p>

+        Specifies how a merge is handled when the merged-in history is

+        already a descendant of the current history.  <code>--ff</code> is the

+        default unless merging an annotated (and possibly signed) tag

+        that is not stored in its natural place in the <code>refs/tags/</code>

+        hierarchy, in which case <code>--no-ff</code> is assumed.

+</p>

+<div class="paragraph"><p>With <code>--ff</code>, when possible resolve the merge as a fast-forward (only

+update the branch pointer to match the merged branch; do not create a

+merge commit).  When not possible (when the merged-in history is not a

+descendant of the current history), create a merge commit.</p></div>

+<div class="paragraph"><p>With <code>--no-ff</code>, create a merge commit in all cases, even when the merge

+could instead be resolved as a fast-forward.</p></div>

+<div class="paragraph"><p>With <code>--ff-only</code>, resolve the merge as a fast-forward when possible.

+When not possible, refuse to merge and exit with a non-zero status.</p></div>

 </dd>

 <dt class="hdlist1">

 -S[&lt;keyid&gt;]

@@ -2060,7 +2055,7 @@ branch.&lt;name&gt;.mergeOptions
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-09-18 12:25:17 PDT

+ 2019-09-19 04:25:17 JST

 </div>

 </div>

 </body>