diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 6 |
1 files changed, 3 insertions, 3 deletions
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" | |||
| 65 | '((t (:strike-through t))) | 65 | '((t (:strike-through t))) |
| 66 | "Face for skipped commits.") | 66 | "Face for skipped commits.") |
| 67 | 67 | ||
| 68 | (defconst gitmerge-default-branch "origin/emacs-24" | 68 | (defconst gitmerge-default-branch "origin/emacs-25" |
| 69 | "Default for branch that should be merged.") | 69 | "Default for branch that should be merged.") |
| 70 | 70 | ||
| 71 | (defconst gitmerge-buffer "*gitmerge*" | 71 | (defconst gitmerge-buffer "*gitmerge*" |
| @@ -183,8 +183,8 @@ if and why this commit should be skipped." | |||
| 183 | ;; Go through the log and remember all commits that match | 183 | ;; Go through the log and remember all commits that match |
| 184 | ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. | 184 | ;; `gitmerge-skip-regexp' or are marked by --cherry-mark. |
| 185 | (with-temp-buffer | 185 | (with-temp-buffer |
| 186 | (call-process "git" nil t nil "log" "--cherry-mark" from | 186 | (call-process "git" nil t nil "log" "--cherry-mark" |
| 187 | (concat "^" (car (vc-git-branches)))) | 187 | (concat from "..." (car (vc-git-branches)))) |
| 188 | (goto-char (point-max)) | 188 | (goto-char (point-max)) |
| 189 | (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) | 189 | (while (re-search-backward "^commit \\(.+\\) \\([0-9a-f]+\\).*" nil t) |
| 190 | (let ((cherrymark (match-string 1)) | 190 | (let ((cherrymark (match-string 1)) |