kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Documentation/merge-options.txt: restore `-e` option 

It looks like commit f8246281af
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>
maint
Richard Hansen 2013-05-16 18:26:00 -04:00 committed by Junio C Hamano
parent 92758dd2a2
commit 66fa1b2c35
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/merge-options.txt
View File

@ -8,12 +8,13 @@ failed and do not autocommit, to give the user a chance to
inspect and further tweak the merge result before committing. inspect and further tweak the merge result before committing.


--edit:: --edit::
-e::
--no-edit:: --no-edit::
Invoke an editor before committing successful mechanical merge to Invoke an editor before committing successful mechanical merge to
further edit the auto-generated merge message, so that the user further edit the auto-generated merge message, so that the user
can explain and justify the merge. The `--no-edit` option can be can explain and justify the merge. The `--no-edit` option can be
used to accept the auto-generated message (this is generally used to accept the auto-generated message (this is generally
discouraged). The `--edit` option is still useful if you are discouraged). The `--edit` (or `-e`) option is still useful if you are
giving a draft message with the `-m` option from the command line giving a draft message with the `-m` option from the command line
and want to edit it in the editor. and want to edit it in the editor.
+ +