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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refine	Charles A. Roelli	2019-03-03	1	-1/+1
*	Merge from origin/emacs-26	Paul Eggert	2018-12-31	1	-1/+1
\|\
\| *	Update copyright year to 2019	Paul Eggert	2019-01-01	1	-1/+1
* \|	* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.	Glenn Morris	2018-12-10	1	-1/+1
* \|	* admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.	Glenn Morris	2018-10-24	1	-9/+18
* \|	Stop assuming .git is a directory in gitmerge.el	Noam Postavsky	2018-06-18	1	-2/+6
* \|	Small improvement for noninteractive gitmerge	Glenn Morris	2018-01-15	1	-2/+7
* \|	Small gitmerge-skip-regexp fix	Glenn Morris	2018-01-15	1	-1/+1
* \|	Merge from origin/emacs-26	Paul Eggert	2018-01-01	1	-1/+1
\|\ \ \| \|/
\| *	Update copyright year to 2018	Paul Eggert	2018-01-01	1	-1/+1
* \|	Set minimum number of commits for gitmerge in batch mode	Glenn Morris	2017-12-18	1	-0/+9
* \|	* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.	Glenn Morris	2017-12-18	1	-2/+10
* \|	Make gitmerge usable in batch mode	Glenn Morris	2017-12-18	1	-4/+11
* \|	* admin/gitmerge.el (gitmerge-missing):	Glenn Morris	2017-12-12	1	-0/+1
* \|	Fix gitmerge handling of automatic conflict reslution	Glenn Morris	2017-12-12	1	-11/+12
* \|	* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.	Glenn Morris	2017-12-11	1	-1/+5
* \|	* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)	Glenn Morris	2017-12-01	1	-19/+41
* \|	Don't hard-code gitmerge.el's default merge branch	Glenn Morris	2017-12-01	1	-3/+19
* \|	* admin/gitmerge.el (gitmerge-resolve):	Glenn Morris	2017-12-01	1	-2/+4
* \|	Merge from origin/emacs-26	Paul Eggert	2017-11-08	1	-1/+1
\|\ \ \| \|/
\| *	* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.	Glenn Morris	2017-11-08	1	-1/+1
* \|	emacs-25 → emacs-26	Paul Eggert	2017-09-25	1	-1/+1
\|/
*	Prefer HTTPS to FTP and HTTP in documentation	Paul Eggert	2017-09-13	1	-1/+1
*	Amend gitmerge to recognize the injunction "don't merge".	Alan Mackenzie	2017-03-29	1	-1/+1
*	Revert "Replace ldefs-boot with a much smaller file"	Phillip Lord	2017-03-07	1	-1/+1
*	Merge from origin/emacs-25	Paul Eggert	2017-01-01	1	-1/+1
\|\
\| *	Update copyright year to 2017	Paul Eggert	2016-12-31	1	-1/+1
\| *	gitmerge: Add cherry pick to gitmerge-skip-regexp	David Engster	2016-10-06	1	-2/+4
* \|	Replace ldefs-boot with a much smaller file	Phillip Lord	2016-12-13	1	-1/+1
* \|	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