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

	Commit message (Expand)	Author	Age	Files	Lines
*	* admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.	Glenn Morris	2012-08-28	1	-3/+10
*	Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com	Chong Yidong	2012-08-11	1	-1/+2
\|\
\| *	* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.	Glenn Morris	2012-08-09	1	-1/+2
* \|	Merge from emacs-24	Stefan Monnier	2012-07-17	1	-4/+4
\|\ \ \| \|/
* \|	Reduce use of (require 'cl).	Stefan Monnier	2012-07-10	1	-5/+4
* \|	* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".	Glenn Morris	2012-05-02	1	-1/+2
* \|	* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".	Glenn Morris	2012-04-10	1	-3/+3
\|/
*	Small bzrmerge.el change.	Glenn Morris	2012-01-18	1	-3/+17
*	Add 2012 to FSF copyright years for Emacs files	Glenn Morris	2012-01-05	1	-1/+1
*	* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.	Glenn Morris	2011-05-21	1	-1/+2
*	Add comments about fixing dates in merged ChangeLogs.	Glenn Morris	2011-02-22	1	-0/+3
*	* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.	Glenn Morris	2011-02-12	1	-1/+3
*	bzrmerge.el trivia.	Glenn Morris	2011-02-05	1	-1/+9
*	bzrmerge.el trivia.	Glenn Morris	2011-02-02	1	-9/+16
*	Make it easier to control which revisions bzrmerge might skip.	Glenn Morris	2011-01-24	1	-2/+7
*	Convert consecutive FSF copyright years to ranges.	Glenn Morris	2011-01-24	1	-1/+1
*	* admin/bzrmerge.el: Fix paren typo in previous.	Glenn Morris	2011-01-17	1	-1/+1
*	* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in	Stefan Monnier	2011-01-17	1	-0/+11
*	bzrmerge.el trivia.	Glenn Morris	2011-01-15	1	-2/+3
*	* admin/bzrmerge.el: Require cl when compiling.	Glenn Morris	2011-01-13	1	-1/+4
*	* admin/bzrmerge.el: Standardize copyright and license headers.	Glenn Morris	2011-01-11	1	-5/+5
*	* admin/bzrmerge.el: New file to help merge branches while skipping	Stefan Monnier	2010-12-26	1	-0/+296