summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-12-06 22:07:57 -0500
committerKyle Meyer <kyle@kyleam.com>2016-12-06 22:07:57 -0500
commitd400628bc56b989334234ce8cca57996464cdcea (patch)
treea1c2a52bd7587c4270088757d2f5d1383a08710d
parent3cfd961e1c9259ba3a8e1ec3f1e251e9248062af (diff)
downloademacs.d-d400628bc56b989334234ce8cca57996464cdcea.tar.gz
magit: Update for margin changes
Magit bb8626d (Merge branch 'margin' [#2885], 2016-12-05)
-rw-r--r--init.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/init.el b/init.el
index c49582e..df8c174 100644
--- a/init.el
+++ b/init.el
@@ -878,6 +878,7 @@
("s" . magit-stage-file))
(define-key km/git-map "w" 'km/magit-wip-map)
(setq magit-push-current-set-remote-if-missing nil)
+ (setq magit-log-margin '(nil age magit-log-margin-width t 18))
:config
(setq magit-push-always-verify nil
magit-delete-by-moving-to-trash nil
@@ -892,13 +893,6 @@
(lambda (x) (string-prefix-p "-n" x))
magit-log-arguments)))
- (dolist (margin (list magit-cherry-margin
- magit-log-margin
- magit-log-select-margin
- magit-reflog-margin
- magit-stashes-margin))
- (setf (nth 0 margin) nil))
-
(setq magit-uniquify-buffer-names nil
magit-buffer-name-format "*%M%v: %t*")
(setq magit-no-confirm '(stage-all-changes unstage-all-changes reverse))