From: David Engster <deng@randomsample.de>
Date: Sat, 14 Nov 2015 16:53:10 +0000 (+0100)
Subject: gitmerge: Try to detect cherry-picks
X-Git-Tag: emacs-26.0.90~2953
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ac79ae;p=emacs.git

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.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c8cf2dcc565..4197ac37195 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -65,7 +65,7 @@ Auto-commit"
   '((t (:strike-through t)))
   "Face for skipped commits.")
 
-(defconst gitmerge-default-branch "origin/emacs-24"
+(defconst gitmerge-default-branch "origin/emacs-25"
   "Default for branch that should be merged.")
 
 (defconst gitmerge-buffer "*gitmerge*"
@@ -183,8 +183,8 @@ if and why this commit should be skipped."
     ;; Go through the log and remember all commits that match
     ;; `gitmerge-skip-regexp' or are marked by --cherry-mark.
     (with-temp-buffer
-      (call-process "git" nil t nil "log" "--cherry-mark" from
-		    (concat "^" (car (vc-git-branches))))
+      (call-process "git" nil t nil "log" "--cherry-mark"
+		    (concat from "..." (car (vc-git-branches))))
       (goto-char (point-max))
       (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t)
 	(let ((cherrymark (match-string 1))