diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-27 00:04:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-27 00:05:54 (GMT) |
| commit | 25db465a34ab6fe840011e5d746701186e9e9884 (patch) | |
| tree | 40cbd66ea98949daa1d273e4b7c5d4159a6b102b /Documentation | |
| parent | 0faf2da7e5ee5c2f472d8a7afaf8616101f34e80 (diff) | |
| download | git-25db465a34ab6fe840011e5d746701186e9e9884.zip git-25db465a34ab6fe840011e5d746701186e9e9884.tar.gz git-25db465a34ab6fe840011e5d746701186e9e9884.tar.bz2 | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-log.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-rev-list.txt | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 5920d17..d71e51a 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -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 diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index a03f9fe..438dae0 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -15,6 +15,7 @@ SYNOPSIS [ \--min-age=timestamp ] [ \--sparse ] [ \--no-merges ] + [ \--first-parent ] [ \--remove-empty ] [ \--full-history ] [ \--not ] @@ -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) |