diff options
author | Richard Hansen <rhansen@bbn.com> | 2013-05-16 18:26:00 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-16 16:40:00 -0700 |
commit | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (patch) | |
tree | 869014b7d8899375bf0816b337025639096d1dff /Documentation | |
parent | Git 1.8.2.3 (diff) | |
download | tgif-66fa1b2c354f79ed48f5986ee700ccb2d167ccbf.tar.xz |
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>
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 34a8445828..f192cd2e16 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. + |