diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:54 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 5071c7531692f53cdfec43542f1cbaee573fd2be (patch) | |
| tree | 550bb736a52a19547d066228cc31ca8723689cca /Documentation/git-var.txt | |
| parent | diff-merges: let new options enable diff without -p (diff) | |
| download | tgif-5071c7531692f53cdfec43542f1cbaee573fd2be.tar.xz | |
diff-merges: add old mnemonic counterparts to --diff-merges
This adds --diff-merges={m|c|cc} values that match mnemonics of old
options, for those who are used to them.
Note that, say, --diff-meres=cc behaves differently than --cc, as the
latter implies -p and therefore enables diffs for all the commits,
while the former enables output of diffs for merge commits only.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-var.txt')
0 files changed, 0 insertions, 0 deletions