summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
AgeCommit message (Expand)Author
2013-03-16Merge from emacs-24Stefan Monnier
2013-03-02* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.Paul Eggert
2013-01-01Update copyright notices for 2013.Paul Eggert
2012-08-28* admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.Glenn Morris
2012-08-11Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.comChong Yidong
2012-08-09* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.Glenn Morris
2012-07-17Merge from emacs-24Stefan Monnier
2012-07-10Reduce use of (require 'cl).Stefan Monnier
2012-05-02* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".Glenn Morris
2012-04-10* admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".Glenn Morris
2012-01-18Small bzrmerge.el change.Glenn Morris
2012-01-05Add 2012 to FSF copyright years for Emacs filesGlenn Morris
2011-05-21* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.Glenn Morris
2011-02-22Add comments about fixing dates in merged ChangeLogs.Glenn Morris
2011-02-12* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris
2011-02-05bzrmerge.el trivia.Glenn Morris
2011-02-02bzrmerge.el trivia.Glenn Morris
2011-01-24Make it easier to control which revisions bzrmerge might skip.Glenn Morris
2011-01-24Convert consecutive FSF copyright years to ranges.Glenn Morris
2011-01-17* admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris
2011-01-17* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier
2011-01-15bzrmerge.el trivia.Glenn Morris
2011-01-13* admin/bzrmerge.el: Require cl when compiling.Glenn Morris
2011-01-11* admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris
2010-12-26* admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-25 15:23:59 +0000