From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Aug 2025 15:10:33 +0000 (-0700)
Subject: Merge branch 'lm/add-p-context'
X-Git-Tag: v2.51.0-rc0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d63f334a8242f9e993b5bfb451f03394023ab877;p=thirdparty%2Fgit.git

Merge branch 'lm/add-p-context'

"git add/etc -p" now honor the diff.context configuration variable,
and also they learn to honor the -U<n> command-line 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
---

d63f334a8242f9e993b5bfb451f03394023ab877