summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-12-09 16:26:22 -0500
committerKyle Meyer <kyle@kyleam.com>2018-12-09 16:26:22 -0500
commit27c846258f343b3a82d54d014990b6168b6fa481 (patch)
treee297070e228fa013631d41295bfc2d921efc1095 /init.el
parent6be8da8da3bdf7deb757242e6f7d9f5696250363 (diff)
downloademacs.d-27c846258f343b3a82d54d014990b6168b6fa481.tar.gz
Specify magit-branch-adjust-remote-upstream-alist
Diffstat (limited to 'init.el')
-rw-r--r--init.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/init.el b/init.el
index d8e819d..0fc516e 100644
--- a/init.el
+++ b/init.el
@@ -965,6 +965,9 @@
(setq magit-no-confirm '(stage-all-changes unstage-all-changes reverse))
(setq magit-published-branches nil)
+ (setq magit-branch-adjust-remote-upstream-alist
+ '(("master" "master" "next" "maint")))
+
(add-to-list 'magit-blame-disable-modes 'lispy-mode)
(setq magit-branch-arguments