author | Alexandre Julliard <julliard@winehq.org> | |
Fri, 3 Nov 2006 16:42:43 +0000 (17:42 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 4 Nov 2006 09:50:35 +0000 (01:50 -0800) | ||
commit | 2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76 | |
tree | 6e37b53ef9a82044a4beba62344b702bc6c163c3 | tree | snapshot |
parent | 2ac2b19601cd8db8660a8d55647079f1ff4885b1 | commit | diff |
git.el: Include MERGE_MSG in the log-edit buffer even when not committing a merge.
This lets us take advantage of the fact that git-cherry-pick now saves
the message in MERGE_MSG too.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This lets us take advantage of the fact that git-cherry-pick now saves
the message in MERGE_MSG too.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
contrib/emacs/git.el | diff | blob | history |