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 'magit-directors-cut' into all

Browse Source
This commit is contained in:
Jonas Bernoulli
2017-07-26 22:39:19 +02:00
parent 96ad3d65a3 f0f097c406
commit d39d1ce2f3
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
init.el
View File

@@ -203,25 +203,21 @@
'replace) 'replace)
;; ;;
;; Diff buffer settings ;; Diff buffer settings
(setq magit-diff-refine-hunk 'all) (setq magit-diff-refine-hunk 'all))
;;
;; Load extensions
(require 'magit-rockstar)
(require 'magit-wip))
(use-package magit-rockstar (use-package magit-rockstar
:defer t :after magit
:functions (magit-define-popup-action) :functions (magit-define-popup-action)
: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 (magit-define-popup-action 'magit-rebase-popup
?R "Rockstar" 'magit-rockstar) ?R "Rockstar" 'magit-rockstar)
(magit-define-popup-action 'magit-pull-and-fetch-popup (magit-define-popup-action 'magit-branch-popup
?P "pull request" 'magit-branch-pull-request)) ?p "Create from pull-request" 'magit-branch-pull-request))
(use-package magit-wip (use-package magit-wip
:defer t :after magit
:config :config
(magit-wip-before-change-mode) (magit-wip-before-change-mode)
(magit-wip-after-apply-mode) (magit-wip-after-apply-mode)

2
lib/magit-rockstar

Submodule lib/magit-rockstar updated: bccce1ac8e...9261f70d72

2
lib/orgit

Submodule lib/orgit updated: cbce5871fe...c91e662ace