diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 13:31:26 -0800 |
| commit | c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1 (patch) | |
| tree | 1e2fc163814f8a67de8629f2a39db92f2160c39b /git-merge.html | |
| parent | fd98be8ac969289726bc1df7bab75d2e02ddbaa7 (diff) | |
| download | git-htmldocs-c5bd79e0cb5f924e05e9e6cdb64a4be2ade572e1.tar.gz | |
Autogenerated HTML docs for v1.9-rc1
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-merge.html b/git-merge.html index 8577d5f4c..8c9e46d53 100644 --- a/git-merge.html +++ b/git-merge.html @@ -835,9 +835,10 @@ inspect and further tweak the merge result before committing.</p></div> 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> (or <tt>-e</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.
+ discouraged).
+The <tt>--edit</tt> (or <tt>-e</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
|