diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-11 13:13:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-11 13:13:58 -0700 |
| commit | 8650543e482acdf539612ec574eb622f785d417f (patch) | |
| tree | a1478e0edca57350197c6db4a77ac52ddb624316 /diff-options.txt | |
| parent | fd8847bd04ba0d64e26663601bf06ae710492579 (diff) | |
| download | git-htmldocs-8650543e482acdf539612ec574eb622f785d417f.tar.gz | |
Autogenerated HTML docs for v2.33.0-rc2
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/diff-options.txt b/diff-options.txt index 0aebe8320..c89d530d3 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -49,9 +49,10 @@ ifdef::git-log[] --diff-merges=m::: -m::: This option makes diff output for merge commits to be shown in - the default format. The default format could be changed using + the default format. `-m` will produce the output only if `-p` + is given as well. The default format could be changed using `log.diffMerges` configuration parameter, which default value - is `separate`. `-m` implies `-p`. + is `separate`. + --diff-merges=first-parent::: --diff-merges=1::: @@ -61,8 +62,7 @@ ifdef::git-log[] --diff-merges=separate::: This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated - for each parent. This is the format that `-m` produced - historically. + for each parent. + --diff-merges=combined::: --diff-merges=c::: |