diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:36:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-03 15:36:30 -0700 |
| commit | 15afe9596c101d00085830c54fdc4c4ad0b7193e (patch) | |
| tree | 355012e6a3d7a8b3c1c69b3f1ae2c1708ba4dbb0 /Documentation | |
| parent | c9d9a2d6b60178d604a2b78886b031d250980e9f (diff) | |
| parent | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (diff) | |
| download | git-15afe9596c101d00085830c54fdc4c4ad0b7193e.tar.gz | |
Merge branch 'rh/merge-options-doc-fix' into maint
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 2adccf8fec..afba8d4f3b 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -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. + |