Commit 2ac79ae9 authored by David Engster's avatar David Engster

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.
parent 5f7a2a90
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment