summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-19 17:49:27 (GMT)
commit3dfbe68fc29248feea3a384e156497ca2463f932 (patch)
treea2681a7cd7fc4be97475709b775ee0024d45eeb5 /Documentation
parent9b55aa03daebf43067021b7d58abea249229987b (diff)
parent66f4b98ad9a8218ad97b7b2f1604b205072dda62 (diff)
downloadgit-3dfbe68fc29248feea3a384e156497ca2463f932.zip
git-3dfbe68fc29248feea3a384e156497ca2463f932.tar.gz
git-3dfbe68fc29248feea3a384e156497ca2463f932.tar.bz2
Merge branch 'js/merge-edit-option'
* js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/merge-options.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index b613d4e..6bd0b04 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -7,6 +7,12 @@ With --no-commit perform the merge but pretend the merge
failed and do not autocommit, to give the user a chance to
inspect and further tweak the merge result before committing.
+--edit::
+-e::
++
+ Invoke editor before committing successful merge to further
+ edit the default merge message.
+
--ff::
--no-ff::
Do not generate a merge commit if the merge resolved as