]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'so/diff-index-regression-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:24 +0000 (13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Sep 2021 20:15:24 +0000 (13:15 -0700)
Recent "diff -m" changes broke "gitk", which has been corrected.

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


Trivial merge