summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-09-12 01:00:30 -0400
committerKyle Meyer <kyle@kyleam.com>2014-09-12 01:00:30 -0400
commit1b6be9daf60a5e92eb0cf03d946c1478ed8df40c (patch)
treee64d9dd76931df572dcdcf82192bfa5e86261998 /lisp
parentdc5a1c293a85f47f160f28c1268f61134348edfc (diff)
downloademacs.d-1b6be9daf60a5e92eb0cf03d946c1478ed8df40c.tar.gz
Update for Magit name change
Commit c1a79dc changed `magit-TOPIC-popup-defaults' to `magit-TOPIC-arguments'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-git.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index bf7fd1f..7402042 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -109,8 +109,8 @@ START-POINT set to the current branch.
(magit-define-popup-action 'magit-branch-popup
?m "Checkout master" 'km/magit-checkout-master)
- (setq magit-branch-popup-defaults
- (delete "--track" magit-branch-popup-defaults)))
+ (setq magit-branch-arguments
+ (delete "--track" magit-branch-arguments)))
(define-key ctl-x-4-map "g" 'magit-find-file-other-window)
(define-key km/file-map "g" 'magit-find-file)