mirror of
https://codeberg.org/scip/dot-emacs.git
synced 2026-08-23 21:24:18 +02:00
Compare commits
2 Commits
9aae50bc5c
...
b05ec0c517
| Author | SHA1 | Date | |
|---|---|---|---|
| b05ec0c517 | |||
| 57b51dae23 |
@@ -49,7 +49,7 @@
|
|||||||
^Smerge Mode^
|
^Smerge Mode^
|
||||||
^^--------------------------------------------------------------
|
^^--------------------------------------------------------------
|
||||||
_n_: next conflict _u_: keep upper _s_: swap
|
_n_: next conflict _u_: keep upper _s_: swap
|
||||||
_p_: revious conflict _l_: keep lower _h_: highlight
|
_p_: prev conflict _l_: keep lower _h_: highlight
|
||||||
_e_: Ediff _b_: keep base _r_: resolve
|
_e_: Ediff _b_: keep base _r_: resolve
|
||||||
_q_: quit _RET_: keep hunk@point _R_: revert
|
_q_: quit _RET_: keep hunk@point _R_: revert
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,32 @@
|
|||||||
;; *** Magit
|
;; *** Magit
|
||||||
|
|
||||||
;; TODO: add blamer.el (https://github.com/Artawower/blamer.el), currently fails to install (2023/05/08)
|
|
||||||
|
(when (fboundp 'defhydra)
|
||||||
|
(defhydra hydra-blame (:timeout 30.0 :exit nil)
|
||||||
|
"
|
||||||
|
^Blame Mode^
|
||||||
|
^^--------------------------------------------------------------
|
||||||
|
_n_: next chunk _M-w_: copy commit hash hash
|
||||||
|
_p_: prev chunk _c_: cycle style
|
||||||
|
_N_: next chunk same commit _RET_: show current commit
|
||||||
|
_P_: prev chunk same commit _q_: quit blame mode
|
||||||
|
|
||||||
|
^^--------------------------------------------------------------
|
||||||
|
Reach this hydra with <C-x B>, magit-blame mode must be active
|
||||||
|
^^--------------------------------------------------------------
|
||||||
|
|
||||||
|
"
|
||||||
|
|
||||||
|
("n" magit-blame-next-chunk nil)
|
||||||
|
("p" magit-blame-previous-chunk nil)
|
||||||
|
("N" magit-blame-next-chunk-same-commit nil)
|
||||||
|
("P" magit-blame-previous-chunk-same-commit nil)
|
||||||
|
("M-w" magit-blame-copy-hash nil)
|
||||||
|
("RET" magit-show-commit nil)
|
||||||
|
("c" magit-blame-cycle-style nil)
|
||||||
|
("q" nil nil :color blue))
|
||||||
|
|
||||||
|
(global-set-key (kbd "C-x B") 'hydra-blame/body))
|
||||||
|
|
||||||
;; Not much to say about Magit
|
;; Not much to say about Magit
|
||||||
(use-package magit
|
(use-package magit
|
||||||
@@ -16,11 +42,12 @@
|
|||||||
(("C-c g" . magit-file-dispatch))
|
(("C-c g" . magit-file-dispatch))
|
||||||
|
|
||||||
:hook
|
:hook
|
||||||
|
|
||||||
;; automatically fire up smerge hydra when visiting a buffer
|
;; automatically fire up smerge hydra when visiting a buffer
|
||||||
;; containing merge conflict[s]. Hydra see init-ediff.el
|
;; containing merge conflict[s]. Hydra see init-ediff.el
|
||||||
(magit-diff-visit-file . (lambda ()
|
(magit-diff-visit-file . (lambda () (hydra-smerge/body)))
|
||||||
(hydra-smerge/body)))
|
|
||||||
|
// automatically fire up blame hydra, see definition above ont top
|
||||||
|
(magit-blame-mode . (lambda () (hydra-blame/body)))
|
||||||
|
|
||||||
:config
|
:config
|
||||||
(magit-todos-mode)
|
(magit-todos-mode)
|
||||||
|
|||||||
Reference in New Issue
Block a user