diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:58 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | e58142add40e0db354eaed9554d1b0c871e23f7d (patch) | |
| tree | 4234b1489981b60b7022db5584efc95dcd8c8f3b /Documentation/rev-list-options.txt | |
| parent | doc/diff-generate-patch: mention new --diff-merges option (diff) | |
| download | tgif-e58142add40e0db354eaed9554d1b0c871e23f7d.tar.xz | |
doc/rev-list-options: document --first-parent changes merges format
After introduction of the --diff-merges=first-parent, the
--first-parent sets the default format for merges to the same value as
this new option. Document this behavior and add corresponding
reference to --diff-merges.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 002379056a..96cc89d157 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/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`. |