summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2011-10-08 18:39:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-12 20:17:18 (GMT)
commit66f4b98ad9a8218ad97b7b2f1604b205072dda62 (patch)
treebe94cc4c5e014b0f932a6a1d46901961a23478d8 /Documentation/merge-options.txt
parent703f05ad5835cff92b12c29aecf8d724c8c847e2 (diff)
downloadgit-66f4b98ad9a8218ad97b7b2f1604b205072dda62.zip
git-66f4b98ad9a8218ad97b7b2f1604b205072dda62.tar.gz
git-66f4b98ad9a8218ad97b7b2f1604b205072dda62.tar.bz2
Teach merge the '[-e|--edit]' option
Implemented internally instead of as "git merge --no-commit && git commit" so that "merge --edit" is otherwise consistent (hooks, etc) with "merge". Note: the edit message does not include the status information that one gets with "commit --status" and it is cleaned up after editing like one gets with "commit --cleanup=default". A later patch could add the status information if desired. Note: previously we were not calling stripspace() after running the prepare-commit-msg hook. Now we are, stripping comments and leading/trailing whitespace lines if --edit is given, otherwise only stripping leading/trailing whitespace lines if not given --edit. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
-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