]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ad/blame-diff-algorithm' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Nov 2025 18:58:45 +0000 (10:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Nov 2025 18:58:46 +0000 (10:58 -0800)
commite1e456469f14cc1fd01f2b15cbc0386883a89584
tree2eabaa07005c89aa833f775e338a23537bf0eccb
parent53d94af6b4be39ec4e6521403b33b1f1a435370a
parentffffb987fcd3b3d6b88aceed87000ef4a5b6114e
Merge branch 'ad/blame-diff-algorithm' into next

"git blame" learns "--diff-algorithm=<algo>" option.

* ad/blame-diff-algorithm:
  blame: make diff algorithm configurable
  xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
diff.c
merge-ort.c
t/meson.build