From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Sep 2021 20:15:24 +0000 (-0700)
Subject: Merge branch 'so/diff-index-regression-fix'
X-Git-Tag: v2.34.0-rc0~172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8332242b74634ce34a37b0896b86b59848cf8cd;p=thirdparty%2Fgit.git

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

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

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

e8332242b74634ce34a37b0896b86b59848cf8cd