Paul Eggert
a04bf15130
Update more copyright years
...
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'.
2018-12-31 18:47:22 -08:00
Glenn Morris
d404bb5bee
; * admin/automerge: Tweak previous NEWS fix
2018-10-25 22:08:12 -07:00
Glenn Morris
3575dd8e8c
* admin/automerge: Abort if NEWS gets modified.
2018-10-25 21:57:53 -07:00
Glenn Morris
703fdeec8c
* admin/automerge: Quieten initial reset.
2018-03-01 21:19:12 -05:00
Glenn Morris
8156e3f3e0
* admin/automerge: Quieten initial pull if start with reset.
2018-02-23 12:52:11 -05:00
Glenn Morris
041c8c4c5d
* admin/automerge (merge): Report no. of commits if too few.
2018-02-21 21:00:23 -05:00
Glenn Morris
5616125483
* admin/automerge: Speed up check phase.
2018-02-21 20:44:37 -05:00
Glenn Morris
1a04d95266
automerge: adjust meaning of -d option
...
* admin/automerge (nocd): New variable, replacing $dir.
(usage, -d): Option -d no longer takes an argument.
2018-01-31 16:15:16 -05:00
Glenn Morris
113963a89d
automerge: add option to work in specific directory
...
* admin/automerge (usage): Mention -d.
(dir): New variable.
(-d): New option.
(main): If requested, cd to specified directory.
2018-01-31 15:05:14 -05:00
Glenn Morris
aac3ba4d43
automerge: add option to start with a reset
...
* admin/automerge (usage): Mention -r.
(reset): New variable.
(-r): New option.
(main): If requested, do a reset and pull.
2018-01-31 12:54:26 -05:00
Glenn Morris
843f3d4f34
automerge: handle upstream changes during operation
...
* admin/automerge (merge): New function, split from pre-existing code.
(main): If upstream changed during building and testing,
reset local and try merging again.
2018-01-30 21:43:28 -05:00
Glenn Morris
686c83a473
* admin/automerge: Disable rebasing.
2018-01-24 14:44:39 -05:00
Glenn Morris
256bd99a8b
* admin/automerge: New script.
2018-01-18 20:22:53 -05:00
