summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
Commit message (Collapse)AuthorAgeFilesLines
* Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)Glenn Morris2015-06-101-1/+4
| | | | | | | | | * 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.
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-051-1/+1
| | | | Revert to including "skipped" messages in ChangeLog once again.
* * admin/gitmerge.el (gitmerge-commit-message):Glenn Morris2015-06-011-1/+2
| | | | Exclude "skipped" messages from ChangeLog.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Merge from emacs-24Stefan Monnier2014-12-051-14/+11
|
* Spelling fix.Paul Eggert2014-11-281-4/+4
|
* admin: Add gitmerge.elDavid Engster2014-11-271-0/+528
* gitmerge.el: New file.