]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b0bcbb) | patch
automerge: handle upstream changes during operation
authorGlenn Morris <rgm@gnu.org>
Wed, 31 Jan 2018 02:43:28 +0000 (21:43 -0500)
committerGlenn Morris <rgm@gnu.org>
Wed, 31 Jan 2018 02:43:28 +0000 (21:43 -0500)
commit843f3d4f34c2f54fac19d97c32399671f98ccc51
treeaa000aeac8e88a7d92b281735d3eed5f1ee79258tree | snapshot
parent2b0bcbbaa64f95c14deed89fdf279d8be48ee352commit | diff
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.
admin/automerge diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.