diff --git a/init.el b/init.el index 719eaef..75c453f 100644 --- a/init.el +++ b/init.el @@ -134,7 +134,7 @@ ;; ;; Key bindings :bind (("C-x g" . magit-status) - ("C-x M-g" . magit-dispatch-popup)) + ("C-x M-g" . magit-dispatch)) :config (define-key magit-mode-map "f" 'magit-pull-and-fetch-popup) (define-key magit-mode-map "F" nil) @@ -149,9 +149,6 @@ (add-to-list 'magit-no-confirm 'resurrect t) (add-to-list 'magit-no-confirm 'trash t) ;; - ;; Disable usage information - (setq magit-popup-show-help-echo nil) - ;; ;; Window managment (setq magit-display-buffer-function 'magit-display-buffer-fullframe-status-topleft-v1) @@ -192,14 +189,7 @@ (setq magit-diff-refine-hunk 'all) ;; ;; Revision buffer settings - (setq magit-revision-show-gravatars '("^Author: " . "^Commit: ")) - ;; - ;; Additional popup actions - (magit-define-popup-action 'magit-commit-popup - ?n "Reshelve" 'magit-commit-reshelve) - (plist-put magit-rebase-popup :actions - (-replace-at 11 '(?R "to change dates" magit-reshelve-since) - (plist-get magit-rebase-popup :actions)))) + (setq magit-revision-show-gravatars '("^Author: " . "^Commit: "))) (use-package magit-wip :after magit