From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:44 +0000 (-0700)
Subject: Merge branch 'so/diff-index-regression-fix' into maint
X-Git-Tag: v2.33.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf4ca3fdd27996e03c4648339a0d154433516c24;p=thirdparty%2Fgit.git

Merge branch 'so/diff-index-regression-fix' into maint

Recent "diff -m" changes broke "gitk", which has been corrected.

* so/diff-index-regression-fix:
  diff-index: restore -c/--cc options handling
---

bf4ca3fdd27996e03c4648339a0d154433516c24