diff --git a/modules/tools/magit/README.org b/modules/tools/magit/README.org index dc9f13b85..48caabf1c 100644 --- a/modules/tools/magit/README.org +++ b/modules/tools/magit/README.org @@ -21,7 +21,6 @@ This module provides Magit, an interface to the Git version control system. - [[doom-package:forge]] if [[doom-module:+forge]] - [[doom-package:code-review]] if [[doom-module:+forge]] - [[doom-package:magit]] -- [[doom-package:magit-gitflow]] - [[doom-package:magit-todos]] ** Hacks diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 4f74b3cb2..80e001cf8 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -222,10 +222,6 @@ ensure it is built when we actually use Forge." (define-key magit-todos-section-map "j" nil)) -(use-package! magit-gitflow - :hook (magit-mode . turn-on-magit-gitflow)) - - (use-package! evil-collection-magit :when (modulep! :editor evil +everywhere) :defer t @@ -280,13 +276,7 @@ ensure it is built when we actually use Forge." (setcar desc (cdr key)))) (evil-define-key* evil-collection-magit-state git-rebase-mode-map "gj" #'git-rebase-move-line-down - "gk" #'git-rebase-move-line-up)) - - (after! magit-gitflow - (evil-define-key* '(normal visual) magit-mode-map - "%" #'magit-gitflow-popup) - (transient-append-suffix 'magit-dispatch 'magit-worktree - '("%" "Gitflow" magit-gitflow-popup)))) + "gk" #'git-rebase-move-line-up))) (use-package! evil-collection-magit-section diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 853b0b265..88c7b9821 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -8,5 +8,4 @@ (package! code-review :recipe (:files ("graphql" "code-review*.el")) :pin "95b36ec8e7935f96b2f3c6c9086d49cf4a72cbff")) - (package! magit-gitflow :pin "cc41b561ec6eea947fe9a176349fb4f771ed865b") (package! magit-todos :pin "c5030cc27c7c1a48db52b0134bf2648a59a43176"))