diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-14 15:32:20 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 15:32:20 +0900 |
| commit | 01009d54ee08e7b28b2cd86ae8c30f8adaf00d89 (patch) | |
| tree | 8416010a459a1187ca773c0c433859ceea58f466 /diff-options.txt | |
| parent | 37c77fd2893de182d484f65cca6ba011fe633019 (diff) | |
| download | git-htmldocs-01009d54ee08e7b28b2cd86ae8c30f8adaf00d89.tar.gz | |
Autogenerated HTML docs for v2.32.0-93-g670b8
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 530d11591..32e6dee5a 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -49,10 +49,9 @@ ifdef::git-log[] --diff-merges=m::: -m::: This option makes diff output for merge commits to be shown in - the default format. `-m` will produce the output only if `-p` - is given as well. The default format could be changed using + the default format. The default format could be changed using `log.diffMerges` configuration parameter, which default value - is `separate`. + is `separate`. `-m` implies `-p`. + --diff-merges=first-parent::: --diff-merges=1::: @@ -62,7 +61,8 @@ 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. + for each parent. This is the format that `-m` produced + historically. + --diff-merges=combined::: --diff-merges=c::: |