summaryrefslogtreecommitdiff
path: root/admin/automerge
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
* Update some URLsPaul Eggert2019-09-231-1/+1
* Update more copyright yearsPaul Eggert2018-12-311-1/+1
* ; * admin/automerge: Tweak previous NEWS fixGlenn Morris2018-10-251-2/+2
* * admin/automerge: Abort if NEWS gets modified.Glenn Morris2018-10-251-0/+6
* * admin/automerge: Quieten initial reset.Glenn Morris2018-03-011-1/+1
* * admin/automerge: Quieten initial pull if start with reset.Glenn Morris2018-02-231-1/+1
* * admin/automerge (merge): Report no. of commits if too few.Glenn Morris2018-02-211-3/+1
* * admin/automerge: Speed up check phase.Glenn Morris2018-02-211-1/+2
* automerge: adjust meaning of -d optionGlenn Morris2018-01-311-11/+9
* automerge: add option to work in specific directoryGlenn Morris2018-01-311-9/+23
* automerge: add option to start with a resetGlenn Morris2018-01-311-5/+17
* automerge: handle upstream changes during operationGlenn Morris2018-01-301-22/+53
* * admin/automerge: Disable rebasing.Glenn Morris2018-01-241-3/+6
* * admin/automerge: New script.Glenn Morris2018-01-181-0/+196