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>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5920d1799acd2fe84e302b005695e2c795ecad36..d71e51ad46f665a594414aea7e107b4977783e46 100644 (file)
--- 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
 
 --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
 
 -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 a03f9fe5fadc483f47c2fbd0199f72a9619b5fcd..438dae02e2b79701cee15bf04e28e6157c07d4ab 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -15,6 +15,7 @@ SYNOPSIS
             [ \--min-age=timestamp ]
             [ \--sparse ]
             [ \--no-merges ]
             [ \--min-age=timestamp ]
             [ \--sparse ]
             [ \--no-merges ]

+            [ \--first-parent ]

             [ \--remove-empty ]
             [ \--full-history ]
             [ \--not ]
             [ \--remove-empty ]
             [ \--full-history ]
             [ \--not ]


@@ -256,6 +257,15 @@ limiting may be applied.
 
        Do not print commits with more than one parent.
 
 
        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)
 --not::
 
        Reverses the meaning of the '{caret}' prefix (or lack thereof)