From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:43 +0000 (-0800)
Subject: Merge branch 'mk/diff-ignore-regex'
X-Git-Tag: v2.30.0-rc0~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ae0949a036864de1f5caa7b375b875284d1c69e;p=thirdparty%2Fgit.git

Merge branch 'mk/diff-ignore-regex'

"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.

* mk/diff-ignore-regex:
  diff: add -I<regex> that ignores matching changes
  merge-base, xdiff: zero out xpparam_t structures
---

1ae0949a036864de1f5caa7b375b875284d1c69e