diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
commit | 8c860d674a0fd61e7ec06e9025c19101cc058eff (patch) | |
tree | 2f79a6ed738fc24aee4477f9cc1e2e9b540a10ab /rev-list-options.txt | |
parent | 68d44a202822cda89f04e8e831531734207c6cd4 (diff) | |
download | git-htmldocs-8c860d674a0fd61e7ec06e9025c19101cc058eff.tar.gz |
Autogenerated HTML docs for v2.30.0-452-gfb7fa
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r-- | rev-list-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index 002379056..96cc89d15 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -130,6 +130,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). this option allows you to ignore the individual commits brought in to your history by such a merge. +ifdef::git-log[] + This option also changes default diff format for merge commits + to `first-parent`, see `--diff-merges=first-parent` for details. +endif::git-log[] + --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) for all following revision specifiers, up to the next `--not`. |