development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rh/merge-options-doc-fix'

Browse source 
* rh/merge-options-doc-fix:
  Documentation/merge-options.txt: restore `-e` option
This commit is contained in:
Junio C Hamano 2013-06-02 15:48:22 -07:00
parent 7abc6b7151 66fa1b2c35
commit 499eaceb21
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.
--edit::
-e::
--no-edit::
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 `--no-edit` option can be
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
and want to edit it in the editor.
+