scip/dot-emacs
1
0
Fork 0
mirror of https://codeberg.org/scip/dot-emacs.git synced 2026-08-24 05:34:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: scip:f246281bc4abe3ab708d19af5d184a07c773c264
Branches Tags
scip:master
...
compare: scip:9aae50bc5cf8e54e70831efe0272f7cfe115acf8
Branches Tags
scip:master

4 Commits
f246281bc4 ... 9aae50bc5c

Author SHA1 Message Date
Thomas von Dein
9aae50bc5c update smerge hydra 2026-08-19 23:48:26 +02:00
Thomas von Dein
9659ad8b58 automatically fire smerge hydra in conflict buffers 2026-08-19 23:43:55 +02:00
Thomas von Dein
1ce0a66378 add undo, rm popup 2026-08-19 23:30:56 +02:00
Thomas von Dein
301d837851 fine tune smerge hydra 2026-08-19 23:25:03 +02:00
2 changed files with 32 additions and 10 deletions
Expand all files Collapse all files

35
lisp/init-ediff.el
View File

@@ -44,20 +44,35 @@
;; prefix. So just a hydra will do. ;; prefix. So just a hydra will do.
(when (fboundp 'defhydra) (when (fboundp 'defhydra)
(defhydra hydra-smerge (:color blue :timeout 30.0) (defhydra hydra-smerge (:timeout 30.0 :exit nil)
" "
^Smerge Mode^ ^Smerge Mode^
^^------------------------------------------------------- ^^--------------------------------------------------------------
_n_ext conflict keep _u_pper m_e_rge conflicts in Ediff _n_: next conflict _u_: keep upper _s_: swap
_p_revious conflict keep _l_ower _q_uit" _p_: revious conflict _l_: keep lower _h_: highlight
_e_: Ediff _b_: keep base _r_: resolve
_q_: quit _RET_: keep hunk@point _R_: revert
("n" smerge-next nil :exit nil) ^^--------------------------------------------------------------
("p" smerge-prev nil :exit nil) Reach this hydra with <C-x m>
("u" smerge-keep-upper nil :exit nil) ^^--------------------------------------------------------------
("l" smerge-keep-lower nil :exit nil)
("e" smerge-ediff nil :color red)
("q" nil nil :color red))
"
("n" smerge-next nil)
("p" smerge-prev nil)
("u" smerge-keep-upper nil)
("l" smerge-keep-lower nil)
("b" smerge-keep-base nil)
("RET" smerge-keep-current nil)
("h" smerge-refine nil)
("s" smerge-swap nil)
("r" smerge-resolve nil)
("R" undo-tree-undo nil)
("e" smerge-ediff nil :color blue)
("q" nil nil :color blue))
(global-set-key (kbd "C-x m") 'hydra-smerge/body)
(defalias 'merge 'hydra-smerge/body)) (defalias 'merge 'hydra-smerge/body))

7
lisp/init-magit.el
View File

@@ -15,6 +15,13 @@
;; the hassle to go to status before just committing etc. So: ;; the hassle to go to status before just committing etc. So:
(("C-c g" . magit-file-dispatch)) (("C-c g" . magit-file-dispatch))
:hook
;; automatically fire up smerge hydra when visiting a buffer
;; containing merge conflict[s]. Hydra see init-ediff.el
(magit-diff-visit-file . (lambda ()
(hydra-smerge/body)))
:config :config
(magit-todos-mode) (magit-todos-mode)