Skip to content

Commit 25db465

Browse files
committed
Fix documentation of --first-parent in git-log and copy it to git-rev-list
Credit goes to Avi Kivity for noticing the lack of description in rev-list manual page. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 0faf2da commit 25db465

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Documentation/git-log.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,12 @@ include::diff-options.txt[]
4343

4444
--first-parent::
4545
Follow only the first parent commit upon seeing a merge
46-
commit. This option gives a better overview of the
47-
evolution of a particular branch.
46+
commit. This option can give a better overview when
47+
viewing the evolution of a particular topic branch,
48+
because merges into a topic branch tend to be only about
49+
adjusting to updated upstream from time to time, and
50+
this option allows you to ignore the individual commits
51+
brought in to your history by such a merge.
4852

4953
-g, \--walk-reflogs::
5054
Show commits as they were recorded in the reflog. The log contains

Documentation/git-rev-list.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ SYNOPSIS
1515
[ \--min-age=timestamp ]
1616
[ \--sparse ]
1717
[ \--no-merges ]
18+
[ \--first-parent ]
1819
[ \--remove-empty ]
1920
[ \--full-history ]
2021
[ \--not ]
@@ -256,6 +257,15 @@ limiting may be applied.
256257

257258
Do not print commits with more than one parent.
258259

260+
--first-parent::
261+
Follow only the first parent commit upon seeing a merge
262+
commit. This option can give a better overview when
263+
viewing the evolution of a particular topic branch,
264+
because merges into a topic branch tend to be only about
265+
adjusting to updated upstream from time to time, and
266+
this option allows you to ignore the individual commits
267+
brought in to your history by such a merge.
268+
259269
--not::
260270

261271
Reverses the meaning of the '{caret}' prefix (or lack thereof)

0 commit comments

Comments
 (0)