From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:44:41 +0000 (-0700)
Subject: Merge branch 'mm/diff-process-hunks' into seen
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ed4e06cad86a779ca9c630a1d070e742a23c84d;p=thirdparty%2Fgit.git

Merge branch 'mm/diff-process-hunks' into seen

A new 'diff.<driver>.process' configuration has been introduced to
allow a long-running external process to act as a hunk provider,
enabling 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:
  line-log: consult diff process for range tracking
  diff: consult diff process for --stat counts
  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
  gitattributes: document how external diff drivers relate to diff features
---

5ed4e06cad86a779ca9c630a1d070e742a23c84d