]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21522cf a4cf900)
Merge branch 'jc/diff-algo-attribute'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2023 18:08:56 +0000 (10:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2023 18:08:56 +0000 (10:08 -0800)
commitece8dc97ae53d08247aa283b6f299e3e5b2669db
tree3af9afced2453f047c1e45f9d9e4639e89dec0d9tree | snapshot
parent21522cf5d0a719ceb7c4b935294be7737062763acommit | diff
parenta4cf900ee734ce9bb73d57c5dfbb1da4a5a88bd3commit | diff
Merge branch 'jc/diff-algo-attribute'

The "diff" drivers specified by the "diff" attribute attached to
paths can now specify which algorithm (e.g. histogram) to use.

* jc/diff-algo-attribute:
  diff: teach diff to read algorithm from diff driver
  diff: consolidate diff algorithm option parsing
Documentation/gitattributes.txt diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
userdiff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.