| commit | bf4ca3fdd27996e03c4648339a0d154433516c24 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:44 +0000 (12 13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:44 +0000 (12 13:51 -0700) | ||
| tree | a5801cacdacb54c0f3f94ba8a794db554833b885 | treesnapshot (tar.gz zip) |
| parent | d9e267755904d996b82219c00521c241ca52305a | commitdiff |
| parent | 5acffd34738f9718caf2a5811bddbf2f40e968a0 | commitdiff |
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
Recent "diff -m" changes broke "gitk", which has been corrected.
* so/diff-index-regression-fix:
diff-index: restore -c/--cc options handling