summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-01-29 23:19:39 -0500
committerKyle Meyer <kyle@kyleam.com>2021-01-29 23:19:39 -0500
commitcd0146e2fbfa3f1d84ebcba5bedac45d84b995af (patch)
tree2fe78664b5204edaf9b601037ad93b3595dbc473
parentb3f75ef49410f0d1920d3c63bfe73504b4260c65 (diff)
downloademacs.d-cd0146e2fbfa3f1d84ebcba5bedac45d84b995af.tar.gz
Return magit-wip-merge-branch to default
-rw-r--r--init.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/init.el b/init.el
index def97fc..11a319d 100644
--- a/init.el
+++ b/init.el
@@ -1046,7 +1046,7 @@
("l" . magit-wip-log-current)
("o" . magit-wip-log))
- (setq magit-wip-merge-branch t)
+ (setq magit-wip-merge-branch nil)
:config
(magit-wip-mode 1))