Autogenerated HTML docs for v1.7.9-111-gf3fb0

1 files changed, 14 insertions, 4 deletions

diff --git a/git-pull.html b/git-pull.html
index 9a634abd6..00f8466f7 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -700,13 +700,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.

-</p>

+        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