diff --git a/init.el b/init.el index fee8cca..c7e878a 100644 --- a/init.el +++ b/init.el @@ -203,6 +203,8 @@ :defer t) (use-package evil-magit :defer t) +(use-package magit-gitflow + :defer t) (use-package helm-git-grep :defer t) (use-package helm-gitignore @@ -219,8 +221,6 @@ :defer t) (use-package gitignore-mode :defer t) -(use-package git-timemachine - :defer t) (use-package git-link :defer t :config @@ -231,8 +231,6 @@ (global-git-gutter-mode +1)) (use-package gitignore-templates :defer t) -(use-package magit-gitflow - :defer t) ;; Custom keybinding (use-package general @@ -343,8 +341,8 @@ "gI" '(helm-gitignore :which-key "helm gitignore") "%" 'magit-gitflow-popup - "gt" 'gitignore-templates-insert - "gft" 'gitignore-templates-new-file + "gti" 'gitignore-templates-insert + "gtn" 'gitignore-templates-new-file "gM" 'git-messenger:popup-message "gll" 'spacemacs/git-link "glL" 'spacemacs/git-link-copy-url-only