From e5760a223887035bd14e1222c16ed8c7b49cd74e Mon Sep 17 00:00:00 2001 From: Clement Busschaert Date: Mon, 10 Feb 2020 08:38:34 +0100 Subject: [PATCH] evil: smerge hydra on `SPC g m` --- modules/config/default/+evil-bindings.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 7216d1e37..ee85fdaef 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -400,6 +400,8 @@ :desc "Git revert file" "R" #'vc-revert :desc "Copy link to remote" "y" #'+vc/browse-at-remote-kill-file-or-region :desc "Copy link to homepage" "Y" #'+vc/browse-at-remote-kill-homepage + (:when (featurep! :ui hydra) + :desc "SMerge" "m" #'+vc/smerge-hydra/body)) (:when (featurep! :ui vc-gutter) :desc "Git revert hunk" "r" #'git-gutter:revert-hunk :desc "Git stage hunk" "s" #'git-gutter:stage-hunk