diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2021-09-01 19:52:20 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-07 11:11:35 -0700 |
| commit | 5acffd34738f9718caf2a5811bddbf2f40e968a0 (patch) | |
| tree | b72a0462a5eff6c3157ea99c7b2a3cf07ec7c3b7 /mergesort.c | |
| parent | Git 2.33 (diff) | |
| download | tgif-5acffd34738f9718caf2a5811bddbf2f40e968a0.tar.xz | |
diff-index: restore -c/--cc options handling
This fixes 19b2517f (diff-merges: move specific diff-index "-m"
handling to diff-index, 2021-05-21).
That commit disabled handling of all diff for merges options in
diff-index on an assumption that they are unused. However, it later
appeared that -c and --cc, even though undocumented and not being
covered by tests, happen to have had particular effect on diff-index
output.
Restore original -c/--cc options handling by diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergesort.c')
0 files changed, 0 insertions, 0 deletions