Autogenerated HTML docs for v1.7.9-111-gf3fb0

1 files changed, 15 insertions, 5 deletions

diff --git a/git-merge.html b/git-merge.html
index 215a1e4b6..a94f9eb39 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -583,7 +583,7 @@ git-merge(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

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

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

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

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

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

@@ -653,13 +653,23 @@ inspect and further tweak the merge result before committing.</p></div>
 --edit

 </dt>

 <dt class="hdlist1">

--e

+--no-edit

 </dt>

 <dd>

 <p>

-        Invoke editor before committing successful merge to further

-        edit the default merge message.

+        Invoke an editor before committing successful mechanical merge to

+        further edit the auto-generated merge message, so that the user

+        can explain and justify the merge. The <tt>--no-edit</tt> option can be

+        used to accept the auto-generated message (this is generally

+        discouraged). The <tt>--edit</tt> option is still useful if you are

+        giving a draft message with the <tt>-m</tt> option from the command line

+        and want to edit it in the editor.

 </p>

+<div class="paragraph"><p>Older scripts may depend on the historical behaviour of not allowing the

+user to edit the merge log message. They will see an editor opened when

+they run <tt>git merge</tt>. To make it easier to adjust such scripts to the

+updated behaviour, the environment variable <tt>GIT_MERGE_AUTOEDIT</tt> can be

+set to <tt>no</tt> at the beginning of them.</p></div>

 </dd>

 <dt class="hdlist1">

 --ff

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2012-02-01 17:36:24 PDT

 </div>

 </div>

 </body>