X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=setup%2Fmagit.el;h=a8861551b41a782e32f68596a1befd44056e8d98;hb=076c97e375051b1791bd149a5d6d590fce541456;hp=62846ee5e8ae4d4ef6986e88e47163b7d42aa01f;hpb=c5319a9ee8692a27fc17d70fe416c313d10dcd01;p=emacs-init.git

diff --git a/setup/magit.el b/setup/magit.el
index 62846ee..a886155 100644
--- a/setup/magit.el
+++ b/setup/magit.el
@@ -170,5 +170,13 @@
   (interactive "P")
   (quit-window kill-buffer))
 
+(defun magit-diff-master-mergebase (&optional args files)
+  (interactive (magit-diff-arguments))
+  (magit-diff-working-tree
+   (magit-git-string "merge-base" "master" "HEAD") args files))
+
+(magit-define-popup-action 'magit-diff-popup
+  ?m "Diff merge-base master" 'magit-diff-master-mergebase)
+
 ; ignore whitespace
 ; (setq magit-diff-options '("-w"))