delta/emacs.git - git.savannah.gnu.org: git/emacs.git

	Commit message (Expand)	Author	Age	Files	Lines
*	gitmerge: Add cherry pick to gitmerge-skip-regexp	David Engster	2016-05-01	1	-2/+2
*	Compute a better commit message for merges	Paul Eggert	2016-03-22	1	-7/+5
*	* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".	Paul Eggert	2016-03-22	1	-1/+1
*	Change do-not-merge pattern to "do not merge"	Paul Eggert	2016-03-22	1	-4/+5
*	Keep "merge" commits by default in gitmerge	Paul Eggert	2016-03-22	1	-1/+1
*	Merge from origin/emacs-25	John Wiegley	2016-01-11	1	-1/+1
\|\
\| *	Update copyright year to 2016	Paul Eggert	2016-01-01	1	-1/+1
* \|	* admin/gitmerge.el: Tweaks that seemed necessary	Stefan Monnier	2015-12-25	1	-2/+10
* \|	gitmerge: Fix git log command	David Engster	2015-11-14	1	-3/+3
* \|	gitmerge: Try to detect cherry-picks	David Engster	2015-11-14	1	-3/+3
\|/
*	Improve generated ChangeLog for gitmerge.el commits. (Bug#20717)	Glenn Morris	2015-06-10	1	-1/+4
*	* admin/gitmerge.el (gitmerge-commit-message):	Glenn Morris	2015-06-05	1	-1/+1
*	* admin/gitmerge.el (gitmerge-commit-message):	Glenn Morris	2015-06-01	1	-1/+2
*	Update copyright year to 2015	Paul Eggert	2015-01-01	1	-1/+1
*	Merge from emacs-24	Stefan Monnier	2014-12-05	1	-14/+11
*	Spelling fix.	Paul Eggert	2014-11-28	1	-4/+4
*	admin: Add gitmerge.el	David Engster	2014-11-27	1	-0/+528