From 1c102d2878ff2e8e4f645c77a1c4bff834f3230c Mon Sep 17 00:00:00 2001 From: Amolith Date: Mon, 6 Feb 2023 14:16:24 -0500 Subject: [PATCH] add git flow to emacs --- dot_config/doom/config.org.tmpl | 7 +++++++ dot_config/doom/packages.el | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dot_config/doom/config.org.tmpl b/dot_config/doom/config.org.tmpl index 164c491c719a72b00c886cb378e48170409ec5ee..69017bbb3f96ce0a1ad39da3f8e9fb4f18194883 100644 --- a/dot_config/doom/config.org.tmpl +++ b/dot_config/doom/config.org.tmpl @@ -326,6 +326,13 @@ about the time I spend in an editor (setq wakatime-cli-path "/usr/bin/wakatime") #+END_SRC +** Magit + +Use git flow in magit status buffers +#+BEGIN_SRC emacs-lisp +(add-hook 'magit-mode-hook 'turn-on-magit-gitflow) +#+END_SRC + * Custom bindings Following established Doom conventions, bind ~SPC g p~ to ~magit-push-current-to-upstream~ diff --git a/dot_config/doom/packages.el b/dot_config/doom/packages.el index 9d756e8b76ed4964c0b0d941fc8bd1f621416c54..ab777e5c0b30fe0192200cf9e0ac320b6ae99d80 100644 --- a/dot_config/doom/packages.el +++ b/dot_config/doom/packages.el @@ -44,6 +44,9 @@ (package! copilot :recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist"))) +(package! magit-gitflow + :recipe (:host github :repo "jtatarik/magit-gitflow")) + ;; If the package you are trying to install does not contain a PACKAGENAME.el ;; file, or is located in a subdirectory of the repo, you'll need to specify ;; `:files' in the `:recipe':