David Engster
a6e0a67701
gitmerge: Add cherry pick to gitmerge-skip-regexp
...
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
which is the string appended by 'git cherry-pick -x'.
(cherry picked from commit f648e48669
2016-10-06 21:39:55 -04:00
Paul Eggert
0e963201d0
Update copyright year to 2016
...
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Glenn Morris
62afb85efb
Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)
...
* build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits.
* admin/gitmerge.el (gitmerge-commit-message):
Exclude "skipped" messages from ChangeLog once again.
; * ChangLog.2: Related fixes.
2015-06-10 21:13:51 -04:00
Glenn Morris
5977a07d94
* admin/gitmerge.el (gitmerge-commit-message):
...
Revert to including "skipped" messages in ChangeLog once again.
2015-06-05 18:10:07 -04:00
Glenn Morris
9b97b0402c
* admin/gitmerge.el (gitmerge-commit-message):
...
Exclude "skipped" messages from ChangeLog.
2015-06-01 23:16:03 -07:00
Paul Eggert
7e09ef09a4
Update copyright year to 2015
...
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Stefan Monnier
fca389d1d3
Merge from emacs-24
2014-12-05 15:20:02 -05:00
Paul Eggert
dbff8fd118
Spelling fix.
2014-11-28 23:55:17 -08:00
David Engster
f42adad94b
admin: Add gitmerge.el
...
* gitmerge.el: New file.
2014-11-27 18:22:00 +01:00
