]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5f7a2a9) | patch
gitmerge: Try to detect cherry-picks
authorDavid Engster <deng@randomsample.de>
Sat, 14 Nov 2015 16:53:10 +0000 (17:53 +0100)
committerDavid Engster <deng@randomsample.de>
Sat, 14 Nov 2015 16:54:36 +0000 (17:54 +0100)
commit2ac79ae901422384e8d093e079862e57c72ef2dc
tree67fde88b006c25d66425663a0f1ed05839bd0a04tree | snapshot
parent5f7a2a90536557e3dcb3bb64d4bbbd49ea7b3feecommit | diff
gitmerge: Try to detect cherry-picks

* admin/gitmerge.el (gitmerge-default-branch): Change to
origin/emacs-25.
(gitmerge-missing): Use symmetric difference ('...') between
branch and master so that cherry-picks can be detected.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.