mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-06-07 08:14:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove magit-rockstar

Browse Source 
Magit-Rockstar is obsolete.  Magit now provides better
replacements for the main commands from Magit-Rockstar.
This commit is contained in:
Jonas Bernoulli 2018-03-02 22:25:29 +01:00
parent 524ab3fe3d
commit 7cfa3317f5
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -40,9 +40,6 @@
[submodule "magit-popup"] [submodule "magit-popup"]
path = lib/magit-popup path = lib/magit-popup
url = git@github.com:magit/magit-popup.git url = git@github.com:magit/magit-popup.git
[submodule "magit-rockstar"]
path = lib/magit-rockstar
url = git@github.com:tarsius/magit-rockstar.git
[submodule "magit-tbdiff"] [submodule "magit-tbdiff"]
path = lib/magit-tbdiff path = lib/magit-tbdiff
url = git@github.com:magit/magit-tbdiff.git url = git@github.com:magit/magit-tbdiff.git

13
init.el
View File

@ -189,16 +189,13 @@
'append) 'append)
;; ;;
;; Diff buffer settings ;; Diff buffer settings
(setq magit-diff-refine-hunk 'all)) (setq magit-diff-refine-hunk 'all)
;;
(use-package magit-rockstar ;; Additional popup actions
:after magit
:functions (magit-define-popup-action)
:config
(magit-define-popup-action 'magit-commit-popup (magit-define-popup-action 'magit-commit-popup
?n "Reshelve" 'magit-reshelve) ?n "Reshelve" 'magit-commit-reshelve)
(plist-put magit-rebase-popup :actions (plist-put magit-rebase-popup :actions
(-replace-at 11 '(?R "to change dates" magit-rockstar) (-replace-at 11 '(?R "to change dates" magit-reshelve-since)
(plist-get magit-rebase-popup :actions)))) (plist-get magit-rebase-popup :actions))))
(use-package magit-wip (use-package magit-wip

1
lib/magit-rockstar

@ -1 +0,0 @@
Subproject commit c8320472e8a50c8299140ba0943bb1fe485d294a