mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option
This commit is contained in:
commit
499eaceb21
|
@ -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.
|
||||
+
|
||||
|
|
Loading…
Reference in a new issue