]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ad/blame-diff-algorithm'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2025 18:32:40 +0000 (10:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Nov 2025 18:32:40 +0000 (10:32 -0800)
commit1b93acd13a18e8a08c8255fa193b62ed53f29ee7
treeb6eb56f80a53a0eae8aeb6d0a73b3b4657056399
parent716e871d50dc63a6f436442b127571b9268a75a3
parentffffb987fcd3b3d6b88aceed87000ef4a5b6114e
Merge branch 'ad/blame-diff-algorithm'

"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