mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-11-23 11:41:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

magit: Update configuration for use of Transient

Browse Source
This commit is contained in:
Jonas Bernoulli
2019-02-17 00:48:44 +01:00
parent 26a32e4a3c
commit ce2057d285
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
init.el
View File

@@ -134,7 +134,7 @@
;; ;;
;; Key bindings ;; Key bindings
:bind (("C-x g" . magit-status) :bind (("C-x g" . magit-status)
("C-x M-g" . magit-dispatch-popup)) ("C-x M-g" . magit-dispatch))
:config :config
(define-key magit-mode-map "f" 'magit-pull-and-fetch-popup) (define-key magit-mode-map "f" 'magit-pull-and-fetch-popup)
(define-key magit-mode-map "F" nil) (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 'resurrect t)
(add-to-list 'magit-no-confirm 'trash t) (add-to-list 'magit-no-confirm 'trash t)
;; ;;
;; Disable usage information
(setq magit-popup-show-help-echo nil)
;;
;; Window managment ;; Window managment
(setq magit-display-buffer-function (setq magit-display-buffer-function
'magit-display-buffer-fullframe-status-topleft-v1) 'magit-display-buffer-fullframe-status-topleft-v1)
@@ -192,14 +189,7 @@
(setq magit-diff-refine-hunk 'all) (setq magit-diff-refine-hunk 'all)
;; ;;
;; Revision buffer settings ;; Revision buffer settings
(setq magit-revision-show-gravatars '("^Author: " . "^Commit: ")) (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))))
(use-package magit-wip (use-package magit-wip
:after magit :after magit