summaryrefslogtreecommitdiffstats
path: root/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-17 16:40:11 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-17 16:40:11 -0800
commit034a2ff96f3a3aa981e5ae4e242cefa4bd00323b (patch)
tree1c5b32a38d12b6114e1c6c3552b897e87f5140b0 /rev-list-options.txt
parentf1fc6ca2d27889be2f7829e15054bc8067ae9bc6 (diff)
downloadgit-htmldocs-034a2ff96f3a3aa981e5ae4e242cefa4bd00323b.tar.gz
Autogenerated HTML docs for v2.35.1-225-ge2ac9
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r--rev-list-options.txt22
1 files changed, 15 insertions, 7 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt
index 43a86fa56..fd4f4e26c 100644
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -122,19 +122,27 @@ again. Equivalent forms are `--min-parents=0` (any commit has 0 or more
parents) and `--max-parents=-1` (negative numbers denote no upper limit).
--first-parent::
- Follow only the first parent commit upon seeing a merge
- commit. This option can give a better overview when
- viewing the evolution of a particular topic branch,
- because merges into a topic branch tend to be only about
- adjusting to updated upstream from time to time, and
- this option allows you to ignore the individual commits
- brought in to your history by such a merge.
+ When finding commits to include, follow only the first
+ parent commit upon seeing a merge commit. This option
+ can give a better overview when viewing the evolution of
+ a particular topic branch, because merges into a topic
+ branch tend to be only about adjusting to updated upstream
+ from time to time, and 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[]
+--exclude-first-parent-only::
+ When finding commits to exclude (with a '{caret}'), follow only
+ the first parent commit upon seeing a merge commit.
+ This can be used to find the set of changes in a topic branch
+ from the point where it diverged from the remote branch, given
+ that arbitrary merges can be valid topic branch changes.
+
--not::
Reverses the meaning of the '{caret}' prefix (or lack thereof)
for all following revision specifiers, up to the next `--not`.