]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5209731) | patch
Don't hard-code gitmerge.el's default merge branch
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:03:05 +0000 (22:03 -0500)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:03:05 +0000 (22:03 -0500)
commit7c95819de0bb351e77449877cb6899444a99d0c1
treea11b4bfab34659261e986f67f038d14032f8d452tree | snapshot
parent52097314c1a160be622dfcf9f40c33190a90be88commit | diff
Don't hard-code gitmerge.el's default merge branch

* admin/gitmerge.el (gitmerge-default-branch): Make it a variable,
defaulting to nil.
(gitmerge-emacs-version, gitmerge-default-branch): New functions.
(gitmerge): Guess the branch to merge from.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.