summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
Commit message (Expand)AuthorAge
* Update copyright year to 2016Paul Eggert2016-01-01
* ‘text-quoting-style’ fixes for adminPaul Eggert2015-08-27
* Update copyright year to 2015Paul Eggert2015-01-01
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-01
* Merge from emacs-24Stefan Monnier2013-03-16
|\
* | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.Paul Eggert2013-03-02
|/
* Update copyright notices for 2013.Paul Eggert2013-01-01
* * admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.Glenn Morris2012-08-28
* Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.comChong Yidong2012-08-11
|\
| * * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.Glenn Morris2012-08-09
* | Merge from emacs-24Stefan Monnier2012-07-17
|\|
* | Reduce use of (require 'cl).Stefan Monnier2012-07-10
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".Glenn Morris2012-05-02
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".Glenn Morris2012-04-10
|/
* Small bzrmerge.el change.Glenn Morris2012-01-18
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-05
* * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.Glenn Morris2011-05-21
* Add comments about fixing dates in merged ChangeLogs.Glenn Morris2011-02-22
* * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris2011-02-12
* bzrmerge.el trivia.Glenn Morris2011-02-05
* bzrmerge.el trivia.Glenn Morris2011-02-02
* Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-24
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-24
* * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-17
* * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-17
* bzrmerge.el trivia.Glenn Morris2011-01-15
* * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-13
* * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-11
* * admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier2010-12-26
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 05:38:45 +0000