summaryrefslogtreecommitdiffstats
path: root/git-rev-list.html
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 /git-rev-list.html
parentf1fc6ca2d27889be2f7829e15054bc8067ae9bc6 (diff)
downloadgit-htmldocs-034a2ff96f3a3aa981e5ae4e242cefa4bd00323b.tar.gz
Autogenerated HTML docs for v2.35.1-225-ge2ac9
Diffstat (limited to 'git-rev-list.html')
-rw-r--r--git-rev-list.html27
1 files changed, 20 insertions, 7 deletions
diff --git a/git-rev-list.html b/git-rev-list.html
index c24cc18c0..010770b79 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1037,13 +1037,26 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim
</dt>
<dd>
<p>
- 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.
+</p>
+</dd>
+<dt class="hdlist1">
+--exclude-first-parent-only
+</dt>
+<dd>
+<p>
+ When finding commits to exclude (with a <em>&#94;</em>), 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.
</p>
</dd>
<dt class="hdlist1">