From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jul 2025 16:28:50 +0000 (-0700)
Subject: Merge branch 'lm/add-p-context' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=393fa4b64b12da3d3fdcefb02739bb1e82291dcc;p=thirdparty%2Fgit.git

Merge branch 'lm/add-p-context' into next

"git add/etc -p" now honors diff.context configuration variable,
and learns to honor -U<n> option.

* lm/add-p-context:
  add-patch: add diff.context command line overrides
  add-patch: respect diff.context configuration
  t: use test_config in t4055
  t: use test_grep in t3701 and t4055
---

393fa4b64b12da3d3fdcefb02739bb1e82291dcc