]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91031a2) | patch
Make gitmerge usable in batch mode
authorGlenn Morris <rgm@gnu.org>
Tue, 19 Dec 2017 00:38:25 +0000 (19:38 -0500)
committerGlenn Morris <rgm@gnu.org>
Tue, 19 Dec 2017 00:38:25 +0000 (19:38 -0500)
commit1e89864f92b3e1f29592ae914cf6fccce40d49d2
treeb00bfa77972997ce4dc862d38ef0c56f6c9f5b37tree | snapshot
parent91031a2cfd6b6a3b17c0f8724fd5cccf7c32ed5bcommit | diff
Make gitmerge usable in batch mode

* admin/gitmerge.el (gitmerge-missing): Add progress messages.
(gitmerge-maybe-resume): In batch mode, never resume.
(gitmerge): Handle batch mode.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.