diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:51 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 8c0ba528bc3c61f4582bf68d3f0cc2a72f5f3792 (patch) | |
| tree | 2e066a1182411e67351358774c757e774562d6c4 /config.mak.in | |
| parent | diff-merges: make -m/-c/--cc explicitly mutually exclusive (diff) | |
| download | tgif-8c0ba528bc3c61f4582bf68d3f0cc2a72f5f3792.tar.xz | |
diff-merges: implement new values for --diff-merges
We first implement new options as exact synonyms for their original
counterparts, to get all the infrastructure right, and keep functional
improvements for later commits.
The following values are implemented:
--diff-merges= old equivalent
first|first-parent = --first-parent (only format implications)
sep|separate = -m
comb|combined = -c
dense| dense-combined = --cc
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.in')
0 files changed, 0 insertions, 0 deletions