diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-02 16:46:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 16:46:52 -0700 |
| commit | 7e590a1afe350393356fbecdd44a43a42ddfad34 (patch) | |
| tree | 0ff3bfac8994607bda7188f1c19895c965fb96ce /git-merge.html | |
| parent | c710296399a86586e3a5e24ea8519ea2442ab7cf (diff) | |
| download | git-htmldocs-7e590a1afe350393356fbecdd44a43a42ddfad34.tar.gz | |
Autogenerated HTML docs for v1.8.3-182-gb2edae
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.html b/git-merge.html index 566139bc9..29a4cd030 100644 --- a/git-merge.html +++ b/git-merge.html @@ -820,6 +820,9 @@ inspect and further tweak the merge result before committing.</p></div> --edit
</dt>
<dt class="hdlist1">
+-e
+</dt>
+<dt class="hdlist1">
--no-edit
</dt>
<dd>
@@ -828,7 +831,7 @@ 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 <code>--no-edit</code> option can be
used to accept the auto-generated message (this is generally
- discouraged). The <code>--edit</code> option is still useful if you are
+ discouraged). The <code>--edit</code> (or <code>-e</code>) option is still useful if you are
giving a draft message with the <code>-m</code> option from the command line
and want to edit it in the editor.
</p>
|