Code

Teach merge the '[-e|--edit]' option
authorJay Soffian <jaysoffian@gmail.com>
Sat, 8 Oct 2011 18:39:52 +0000 (14:39 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Oct 2011 20:17:18 +0000 (13:17 -0700)
commit66f4b98ad9a8218ad97b7b2f1604b205072dda62
treebe94cc4c5e014b0f932a6a1d46901961a23478d8
parent703f05ad5835cff92b12c29aecf8d724c8c847e2
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>
Documentation/merge-options.txt
builtin/merge.c
t/t7600-merge.sh