Documentation/merge-options.txt: restore `-e` option
It looks like commit f8246281af9adb0fdddbcc90d2e19cb5cd5217e5 unintentionally removed the documentation for the `-e` option. Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Hansen committed
May 16, 2013 at 18:26 UTC
66fa1b2c354f79ed48f5986ee700ccb2d167ccbf
1 file changed
+2
-1
Documentation/merge-options.txt
+2
-1
@@ -8,12 +8,13 @@ failed and do not autocommit, to give the user a chance to
8
inspect and further tweak the merge result before committing.
9
10
--edit::
11
+-e::
12
--no-edit::
13
Invoke an editor before committing successful mechanical merge to
14
further edit the auto-generated merge message, so that the user
15
can explain and justify the merge. The `--no-edit` option can be
16
used to accept the auto-generated message (this is generally
16
- discouraged). The `--edit` option is still useful if you are
17
+ discouraged). The `--edit` (or `-e`) option is still useful if you are
18
giving a draft message with the `-m` option from the command line
19
and want to edit it in the editor.
20
+