summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-12-09 12:31:43 -0500
committerKyle Meyer <kyle@kyleam.com>2018-12-09 12:31:43 -0500
commit6e859d4546e1d0ef7093ff5a7ede679bfc7efaa6 (patch)
tree23ccf83bec5dc6ee448aae289ddf7670ef3ba163 /init.el
parentf068d95816878e4335f7ce293c2e93e639d5d197 (diff)
downloademacs.d-6e859d4546e1d0ef7093ff5a7ede679bfc7efaa6.tar.gz
Add separate use-package section for magit-extras
magit-extras isn't loaded with magit.
Diffstat (limited to 'init.el')
-rw-r--r--init.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/init.el b/init.el
index 35ee213..9e7157b 100644
--- a/init.el
+++ b/init.el
@@ -986,9 +986,6 @@
(setq magit-display-buffer-function
#'magit-display-buffer-fullframe-status-v1)
- (put 'magit-edit-line-commit 'disabled nil)
- (put 'magit-diff-edit-hunk-commit 'disabled nil)
-
(define-key ctl-x-4-map "g" #'magit-find-file-other-window)
(define-key km/file-map "g" #'magit-find-file)
@@ -1102,6 +1099,11 @@
(magit-define-popup-action 'magit-log-popup
?W "Log other WIP" 'magit-wip-log))
+(use-package magit-extras
+ :config
+ (put 'magit-edit-line-commit 'disabled nil)
+ (put 'magit-diff-edit-hunk-commit 'disabled nil))
+
(use-package km-magit
:init
(bind-keys :map km/git-map