diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 13:51:44 -0700 |
| commit | bf4ca3fdd27996e03c4648339a0d154433516c24 (patch) | |
| tree | a5801cacdacb54c0f3f94ba8a794db554833b885 /builtin | |
| parent | d9e267755904d996b82219c00521c241ca52305a (diff) | |
| parent | 5acffd34738f9718caf2a5811bddbf2f40e968a0 (diff) | |
| download | git-bf4ca3fdd27996e03c4648339a0d154433516c24.tar.gz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/diff-index.c b/builtin/diff-index.c index cf09559e42..5fd23ab5b6 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -29,10 +29,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) prefix = precompose_argv_prefix(argc, argv, prefix); /* - * We need no diff for merges options, and we need to avoid conflict - * with our own meaning of "-m". + * We need (some of) diff for merges options (e.g., --cc), and we need + * to avoid conflict with our own meaning of "-m". */ - diff_merges_suppress_options_parsing(); + diff_merges_suppress_m_parsing(); argc = setup_revisions(argc, argv, &rev, NULL); for (i = 1; i < argc; i++) { |