Autogenerated HTML docs for v1.5.3.4-203-gcc61a

1 files changed, 48 insertions, 1 deletions

diff --git a/git-merge.html b/git-merge.html
index ea8855106..329795b6a 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -312,6 +312,15 @@ which drives multiple merge strategy scripts.</p>
 </p>

 </dd>

 <dt>

+--commit

+</dt>

+<dd>

+<p>

+        Perform the merge and commit the result. This option can

+        be used to override --no-commit.

+</p>

+</dd>

+<dt>

 --squash

 </dt>

 <dd>

@@ -326,6 +335,34 @@ which drives multiple merge strategy scripts.</p>
 </p>

 </dd>

 <dt>

+--no-squash

+</dt>

+<dd>

+<p>

+        Perform the merge and commit the result. This option can

+        be used to override --squash.

+</p>

+</dd>

+<dt>

+--no-ff

+</dt>

+<dd>

+<p>

+        Generate a merge commit even if the merge resolved as a

+        fast-forward.

+</p>

+</dd>

+<dt>

+--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.

+</p>

+</dd>

+<dt>

 -s &lt;strategy&gt;, --strategy=&lt;strategy&gt;

 </dt>

 <dd>

@@ -454,6 +491,16 @@ merge.verbosity
         Can be overridden by <em>GIT_MERGE_VERBOSITY</em> environment variable.

 </p>

 </dd>

+<dt>

+branch.&lt;name&gt;.mergeoptions

+</dt>

+<dd>

+<p>

+        Sets default options for merging into branch &lt;name&gt;. The syntax and

+        supported options are equal to that of git-merge, but option values

+        containing whitespace characters are currently not supported.

+</p>

+</dd>

 </dl>

 </div>

 <h2>HOW MERGE WORKS</h2>

@@ -606,7 +653,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 30-Sep-2007 00:49:43 UTC

+Last updated 03-Oct-2007 12:03:50 UTC

 </div>

 </div>

 </body>