procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/gitmerge.el (gitmerge-commit-message):

Browse source 
Exclude "skipped" messages from ChangeLog.
This commit is contained in:
Glenn Morris 2015-06-01 23:16:03 -07:00
parent e3a0f3daf1
commit 9b97b0402c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
admin/gitmerge.el
View file

@ -314,7 +314,8 @@ Returns non-nil if conflicts remain."
SKIP denotes whether those commits are actually skipped. If END
is nil, only the single commit BEG is merged."
(with-temp-buffer
(insert "Merge from " branch "\n\n"
(insert (if skip "; " "")
"Merge from " branch "\n\n"
(if skip
(concat "The following commit"
(if end "s were " " was ")