diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2006-11-03 17:42:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-04 01:50:35 -0800 |
| commit | 2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76 (patch) | |
| tree | 6e37b53ef9a82044a4beba62344b702bc6c163c3 /contrib | |
| parent | 2ac2b19601cd8db8660a8d55647079f1ff4885b1 (diff) | |
| download | git-2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76.tar.gz git-2379d61fa6355bc7a8cc8b5dce87a7d4a9505c76.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/emacs/git.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 6f3b46df9..972c402ea 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -589,6 +589,7 @@ and returns the process output as a string." (let ((commit (git-commit-tree buffer tree head))) (git-update-ref "HEAD" commit head) (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil)) + (condition-case nil (delete-file ".git/MERGE_MSG") (error nil)) (with-current-buffer buffer (erase-buffer)) (git-set-files-state files 'uptodate) (when (file-directory-p ".git/rr-cache") @@ -888,7 +889,7 @@ and returns the process output as a string." 'face 'git-header-face) (propertize git-log-msg-separator 'face 'git-separator-face) "\n") - (cond ((and merge-heads (file-readable-p ".git/MERGE_MSG")) + (cond ((file-readable-p ".git/MERGE_MSG") (insert-file-contents ".git/MERGE_MSG")) (sign-off (insert (format "\n\nSigned-off-by: %s <%s>\n" |