]> git.eshelyaron.com Git - emacs.git/commit
automerge: add option to start with a reset
authorGlenn Morris <rgm@gnu.org>
Wed, 31 Jan 2018 17:54:26 +0000 (12:54 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 31 Jan 2018 17:54:26 +0000 (12:54 -0500)
commitaac3ba4d432d57733420a7ab5d680cfb90aa1ccd
treedfe199cc4a44e0d12b25de1d3337f9952dfda424
parent4dbc1ef5e6cf55426d023be563ff93d74b675218
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.
admin/automerge