[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc5 cb89512 03/20: gitmerge:
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc5 cb89512 03/20: gitmerge: Try to detect cherry-picks |
Date: |
Wed, 18 Nov 2015 19:16:52 +0000 |
branch: feature/aptel/dynamic-modules-rc5
commit cb89512f6cf651ed5623ba3f13e32044f14beb48
Author: David Engster <address@hidden>
Commit: Ted Zlatanov <address@hidden>
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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index c8cf2dc..4197ac3 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))
- [Emacs-diffs] branch feature/aptel/dynamic-modules-rc5 created (now 6cc9efa), Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 bdd314d 02/20: Increment Emacs version on master branch, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 cb89512 03/20: gitmerge: Try to detect cherry-picks,
Teodor Zlatanov <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 1f2b30d 04/20: gitmerge: Fix git log command, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 f9b3ca4 01/20: Update verilog-mode.el to 2015-11-09-b121d60-vpo., Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 274f590 06/20: * lisp/progmodes/verilog-mode.el: Use with-silent-modifications, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 c41bf13 08/20: * lisp/progmodes/verilog-mode.el (verilog-save-buffer-state): Add backquote, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 d45222a 09/20: linum-mode plays more nicely with other margin-setting extensions, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 35c5205 10/20: Minor fix to comment indentation and typo in last commit, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 7076009 12/20: * lisp/progmodes/cc-defs.el: Use with-silent-modifications, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 7e70b27 13/20: Fix issue where a new tempfile was created every refresh, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 543b928 07/20: ; ChangeLog.2 fixes, Teodor Zlatanov, 2015/11/18
- [Emacs-diffs] feature/aptel/dynamic-modules-rc5 e8a941e 11/20: * lisp/loadup.el: Set max-lisp-eval-depth here, Teodor Zlatanov, 2015/11/18