From: Stefan Bund <stefan.bund@traveltainment.de>
Date: Tue, 7 Mar 2017 12:25:51 +0000 (+0100)
Subject: add magit-diff-master-mergebase command
X-Git-Url: http://g0dil.de/git?p=emacs-init.git;a=commitdiff_plain;h=076c97e375051b1791bd149a5d6d590fce541456

add magit-diff-master-mergebase command
---

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"))