summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-08-03 21:42:00 -0400
committerKyle Meyer <kyle@kyleam.com>2018-08-03 21:42:00 -0400
commitacb46b23fbd85417d337d5c4388671a7a4423177 (patch)
tree270071e82a391f021dfe08a08531ee4478491469 /init.el
parenta34de3d7eeb265667d0819ac196c2adbddb5e671 (diff)
downloademacs.d-acb46b23fbd85417d337d5c4388671a7a4423177.tar.gz
Enable magit-wip-merge-branch
Diffstat (limited to 'init.el')
-rw-r--r--init.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/init.el b/init.el
index f0de76f..d556acd 100644
--- a/init.el
+++ b/init.el
@@ -1079,6 +1079,8 @@
("o" . magit-wip-log)
("s" . magit-wip-after-save-local-mode)
("S" . magit-wip-after-save-mode))
+
+ (setq magit-wip-merge-branch t)
:config
(magit-wip-after-save-mode 1)