Skip to content

Commit

Permalink
Fix documentation of --first-parent in git-log and copy it to git-rev…
Browse files Browse the repository at this point in the history
…-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>
  • Loading branch information
Junio C Hamano committed Dec 27, 2007
1 parent 0faf2da commit 25db465
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Documentation/git-log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ include::diff-options.txt[]

--first-parent::
Follow only the first parent commit upon seeing a merge
commit. This option gives a better overview of the
evolution of a particular branch.
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.

-g, \--walk-reflogs::
Show commits as they were recorded in the reflog. The log contains
Expand Down
10 changes: 10 additions & 0 deletions Documentation/git-rev-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ SYNOPSIS
[ \--min-age=timestamp ]
[ \--sparse ]
[ \--no-merges ]
[ \--first-parent ]
[ \--remove-empty ]
[ \--full-history ]
[ \--not ]
Expand Down Expand Up @@ -256,6 +257,15 @@ limiting may be applied.

Do not print commits with more than one parent.

--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.

--not::

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

0 comments on commit 25db465

Please sign in to comment.