Merge branch 'so/diff-index-regression-fix'
commite8332242b74634ce34a37b0896b86b59848cf8cd
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:24 +0000 (15 13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:24 +0000 (15 13:15 -0700)
tree4f2ae8d489af51243d1837d0d5228a3dd2fb7e63
parent8b7c11b8668b4e774f81a9f0b4c30144b818f1d1
parent5acffd34738f9718caf2a5811bddbf2f40e968a0
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