John Wiegley
1dd4f26ab6
Merge from origin/emacs-25
...
ef33bc79c3dbab0e96320
2016-01-11 22:48:07 -08:00
Paul Eggert
0e963201d0
Update copyright year to 2016
...
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Stefan Monnier
de88375991
* admin/gitmerge.el: Tweaks that seemed necessary
...
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
2015-12-25 23:37:36 -05:00
David Engster
dcd5877a76
gitmerge: Fix git log command
...
* admin/gitmerge.el (gitmerge-missing): Use '--left-only' since we
only want commits from the branch that is to be merged.
(gitmerge-setup-log-buffer): Use the same symmetric range as in
`gitmerge-missing'.
2015-11-14 23:16:51 +01:00
David Engster
2ac79ae901
gitmerge: Try to detect cherry-picks
...
* admin/gitmerge.el (gitmerge-default-branch): Change to
origin/emacs-25.
(gitmerge-missing): Use symmetric difference ('...') between
branch and master so that cherry-picks can be detected.
2015-11-14 17:54:36 +01: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
