diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-15 13:15:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-15 13:15:24 -0700 |
| commit | e8332242b74634ce34a37b0896b86b59848cf8cd (patch) | |
| tree | 4f2ae8d489af51243d1837d0d5228a3dd2fb7e63 /builtin/diff-index.c | |
| parent | The fifth batch (diff) | |
| parent | diff-index: restore -c/--cc options handling (diff) | |
| download | git-e8332242b74634ce34a37b0896b86b59848cf8cd.tar.gz git-e8332242b74634ce34a37b0896b86b59848cf8cd.zip | |
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
Diffstat (limited to 'builtin/diff-index.c')
| -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++) { |