gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

When committing a merge, use .git/MERGE_MSG

Browse source 
If someone does a manual merge and then types 'c', Magit will now fill
the log-edit buffer with the contents of .git/MERGE_MSG as a starting
point.
This commit is contained in:
John Wiegley 2009-03-06 02:48:39 -04:00
parent 0d897e61c4
commit 9a09235a07
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit.el
View file

@ -2335,6 +2335,8 @@ Prefix arg means justify as well."
'("--signoff") '()))))))) '("--signoff") '())))))))
(erase-buffer) (erase-buffer)
(bury-buffer) (bury-buffer)
(when (file-exists-p ".git/MERGE_MSG")
(delete-file ".git/MERGE_MSG"))
(when magit-pre-log-edit-window-configuration (when magit-pre-log-edit-window-configuration
(set-window-configuration magit-pre-log-edit-window-configuration) (set-window-configuration magit-pre-log-edit-window-configuration)
(setq magit-pre-log-edit-window-configuration nil)))) (setq magit-pre-log-edit-window-configuration nil))))
@ -2367,6 +2369,8 @@ Prefix arg means justify as well."
(setq magit-pre-log-edit-window-configuration (setq magit-pre-log-edit-window-configuration
(current-window-configuration)) (current-window-configuration))
(pop-to-buffer buf) (pop-to-buffer buf)
(when (file-exists-p ".git/MERGE_MSG")
(insert-file-contents ".git/MERGE_MSG"))
(setq default-directory dir) (setq default-directory dir)
(magit-log-edit-mode) (magit-log-edit-mode)
(message "Type C-c C-c to %s (C-c C-k to cancel)." operation))) (message "Type C-c C-c to %s (C-c C-k to cancel)." operation)))