summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-02 22:48:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-02 22:48:22 (GMT)
commit499eaceb217df573fb3698d7a52e3e5a9b4173bc (patch)
tree4b09c6778ed4eb6a51e5a3a41db35a1c964ed475 /Documentation/merge-options.txt
parent7abc6b715148118518a6fbdcef82b3e0dabbaa17 (diff)
parent66fa1b2c354f79ed48f5986ee700ccb2d167ccbf (diff)
downloadgit-499eaceb217df573fb3698d7a52e3e5a9b4173bc.zip
git-499eaceb217df573fb3698d7a52e3e5a9b4173bc.tar.gz
git-499eaceb217df573fb3698d7a52e3e5a9b4173bc.tar.bz2
Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 2adccf8..afba8d4 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.
+