summaryrefslogtreecommitdiff
path: root/admin/automerge
Commit message (Expand)AuthorAgeFilesLines
* ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
* Add admin/emacs-shell-lib for shared bash codeStefan Kangas2022-10-191-21/+2
* Use "set -o nounset" in bash scriptsStefan Kangas2022-09-201-0/+2
* ; Normalize my emailStefan Kangas2022-08-161-1/+1
* Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
* | ; * admin/automerge: Maintain.Stefan Kangas2021-11-171-1/+1
* | * admin/automerge: Fix quoting of some variables.Stefan Kangas2021-11-101-9/+9
* | * admin/automerge: Use mktemp if it exists.Stefan Kangas2021-11-101-1/+5
* | * admin/automerge: Die if changing directory fails.Stefan Kangas2021-11-081-1/+2
|/
* Update copyright year to 2021Paul Eggert2021-01-011-1/+1
* ; Maintainer header updatesGlenn Morris2020-07-311-0/+1
* 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