]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mm/diff-process-hunks' into seen
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2026 23:14:10 +0000 (08:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jun 2026 23:14:10 +0000 (08:14 +0900)
A new `diff.<driver>.process` configuration has been introduced to
allow a long-running external process to act as a hunk provider to
allows external tools to control which lines Git considers changed
while leaving all output formatting (word diff, color, blame, etc.) to
Git's standard pipeline.

* mm/diff-process-hunks:
  blame: consult diff process for no-hunk detection
  diff: bypass diff process with --no-ext-diff and in format-patch
  diff: add long-running diff process via diff.<driver>.process
  sub-process: separate process lifecycle from hashmap management
  userdiff: add diff.<driver>.process config
  xdiff: support external hunks via xpparam_t

1  2 
Documentation/diff-options.adoc
Makefile
diff.c
meson.build
t/meson.build

Simple merge
diff --cc Makefile
Simple merge
diff --cc diff.c
Simple merge
diff --cc meson.build
Simple merge
diff --cc t/meson.build
Simple merge