Compare commits

...

2 Commits

Author SHA1 Message Date
9e1e976710
Use Histogram Diff Algorithm For Git also in vc.el
I have set `diff.algorithm` to `histogram` anyway, so let's also use this in `vc.el`.

Taken from https://github.com/dgutov/diff-hl?tab=readme-ov-file#notes.
2025-05-01 15:59:26 +02:00
326711f4d2
Update diff-hl fringe marks after committing with magit 2025-05-01 12:56:20 +02:00

11
init.el
View File

@ -1516,7 +1516,8 @@ Note that this workaround is incomplete, as explained in this comment."
(use-package diff-hl
:ensure t
:commands (global-diff-hl-mode
diff-hl-dired-mode))
diff-hl-dired-mode)
:autoload (diff-hl-magit-post-refresh))
(use-package ediff
:init (setq ediff-diff-options "-w"
@ -1621,7 +1622,10 @@ Note that this workaround is incomplete, as explained in this comment."
:config (progn
(when (fboundp 'global-magit-file-mode)
(global-magit-file-mode -1))
(global-git-commit-mode 1)))
(global-git-commit-mode 1)
;; Update diff-hl fringe marks after committing
(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)))
(use-package page-break-lines
:pin "melpa-stable"
@ -1633,6 +1637,9 @@ Note that this workaround is incomplete, as explained in this comment."
transient-values-file (expand-file-name "transient/values.el" emacs-d-userdata)
transient-history-file (expand-file-name "transient/history.el" emacs-d-userdata)))
(use-package vc
:init (setopt vc-git-diff-switches '("--histogram")))
;; * Mail