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

Merge branch 'layer/magit-directors-cut' into layer/all

Browse Source
This commit is contained in:
Jonas Bernoulli
2018-01-11 12:10:53 +01:00
parent 520209db66 7ac2bf1f73
commit 54a89c2be3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
init.el
View File

@@ -158,6 +158,8 @@
;; Disable safety nets ;; Disable safety nets
(setq magit-commit-squash-confirm nil) (setq magit-commit-squash-confirm nil)
(setq magit-save-repository-buffers 'dontask) (setq magit-save-repository-buffers 'dontask)
(setf (nth 2 (assq 'magit-stash-pop magit-dwim-selection)) t)
(setf (nth 2 (assq 'magit-stash-drop magit-dwim-selection)) t)
(add-to-list 'magit-no-confirm 'safe-with-wip t) (add-to-list 'magit-no-confirm 'safe-with-wip t)
(add-to-list 'magit-no-confirm 'rename t) (add-to-list 'magit-no-confirm 'rename t)
(add-to-list 'magit-no-confirm 'resurrect t) (add-to-list 'magit-no-confirm 'resurrect t)
@@ -196,6 +198,10 @@
'magit-insert-modules 'magit-insert-modules
'magit-insert-stashes 'magit-insert-stashes
'append) 'append)
(magit-add-section-hook 'magit-status-sections-hook
'magit-insert-worktrees
'magit-insert-modules
'append)
;; ;;
;; Diff buffer settings ;; Diff buffer settings
(setq magit-diff-refine-hunk 'all)) (setq magit-diff-refine-hunk 'all))
@@ -206,10 +212,9 @@
:config :config
(magit-define-popup-action 'magit-commit-popup (magit-define-popup-action 'magit-commit-popup
?n "Reshelve" 'magit-reshelve) ?n "Reshelve" 'magit-reshelve)
(magit-define-popup-action 'magit-rebase-popup (plist-put magit-rebase-popup :actions
?R "Rockstar" 'magit-rockstar) (-replace-at 11 '(?R "to change dates" magit-rockstar)
(magit-define-popup-action 'magit-branch-popup (plist-get magit-rebase-popup :actions))))
?p "Create from pull-request" 'magit-branch-pull-request))
(use-package magit-wip (use-package magit-wip
:after magit :after magit