aboutsummaryrefslogtreecommitdiffstats
path: root/admin/automerge (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* Update some URLsPaul Eggert2019-09-231-1/+1
| | | | | | | | | | | | | | | | | This mostly changes http: to https: in URLs. It also updates some URLs that have moved, removes some URLs that no longer work, recommends against using procmail (procmail.org no longer works), and removes some mentions of the no-longer-existing Gmane, LPF and VTW. It doesn't update all URLs, just the ones I had time for. * GNUmakefile (help): * admin/admin.el (manual-doctype-string): * admin/charsets/Makefile.in (${charsetdir}/ALTERNATIVNYJ.map): * admin/charsets/mapconv: * lisp/net/soap-client.el (soap-create-envelope): * lisp/org/org.el (org-doi-server-url): * lisp/textmodes/bibtex.el (bibtex-generate-url-list): Prefer https: to http: un URLs.
* Update more copyright yearsPaul Eggert2018-12-311-1/+1
| | | | | | | | Update some other copyright years automatically, by running: Run 'UPDATE_COPYRIGHT_YEAR=2019 \ UPDATE_COPYRIGHT_USE_INTERVALS=1 \ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 admin/update-copyright' followed by 'admin/merge-gnulib'.
* ; * 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
| | | | | * admin/automerge (nocd): New variable, replacing $dir. (usage, -d): Option -d no longer takes an argument.
* automerge: add option to work in specific directoryGlenn Morris2018-01-311-9/+23
| | | | | | | * admin/automerge (usage): Mention -d. (dir): New variable. (-d): New option. (main): If requested, cd to specified directory.
* automerge: add option to start with a resetGlenn Morris2018-01-311-5/+17
| | | | | | | * admin/automerge (usage): Mention -r. (reset): New variable. (-r): New option. (main): If requested, do a reset and pull.
* automerge: handle upstream changes during operationGlenn Morris2018-01-301-22/+53
| | | | | | * admin/automerge (merge): New function, split from pre-existing code. (main): If upstream changed during building and testing, reset local and try merging again.
* * admin/automerge: Disable rebasing.Glenn Morris2018-01-241-3/+6
|
* * admin/automerge: New script.Glenn Morris2018-01-181-0/+196
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-05 15:22:50 +0000