Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 989fbf3562977866d7d2558022587847f538ae4b..db42cd8a9295b96728509c9859441df844177dc4 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 ]
+            [ \--first-parent ]
             [ \--remove-empty ]
             [ \--full-history ]
             [ \--not ]
@@ -78,11 +79,11 @@ between the two operands.  The following two commands are equivalent:
        $ git-rev-list A...B
 -----------------------------------------------------------------------
 
-gitlink:git-rev-list[1] is a very essential git program, since it
+linkgit:git-rev-list[1] is a very essential git program, since it
 provides the ability to build and traverse commit ancestry graphs. For
 this reason, it has a lot of different options that enables it to be
-used by commands as different as gitlink:git-bisect[1] and
-gitlink:git-repack[1].
+used by commands as different as linkgit:git-bisect[1] and
+linkgit:git-repack[1].
 
 OPTIONS
 -------
@@ -90,9 +91,9 @@ OPTIONS
 Commit Formatting
 ~~~~~~~~~~~~~~~~~
 
-Using these options, gitlink:git-rev-list[1] will act similar to the
-more specialized family of commit log tools: gitlink:git-log[1],
-gitlink:git-show[1], and gitlink:git-whatchanged[1]
+Using these options, linkgit:git-rev-list[1] will act similar to the
+more specialized family of commit log tools: linkgit:git-log[1],
+linkgit:git-show[1], and linkgit:git-whatchanged[1]
 
 include::pretty-options.txt[]
 
@@ -166,8 +167,8 @@ Diff Formatting
 ~~~~~~~~~~~~~~~
 
 Below are listed options that control the formatting of diff output.
-Some of them are specific to gitlink:git-rev-list[1], however other diff
-options may be given. See gitlink:git-diff-files[1] for more options.
+Some of them are specific to linkgit:git-rev-list[1], however other diff
+options may be given. See linkgit:git-diff-files[1] for more options.
 
 -c::
 
@@ -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)
@@ -274,7 +284,7 @@ limiting may be applied.
 --quiet::
 
        Don't print anything to standard output.  This form of
-       git-rev-list is primarly meant to allow the caller to
+       git-rev-list is primarily meant to allow the caller to
        test the exit status to see if a range of objects is fully
        connected (or not).  It is faster than redirecting stdout
        to /dev/null as the output does not have to be formatted.
@@ -418,7 +428,7 @@ These options are mostly targeted for packing of git repositories.
 
        Similar to '--objects', but also print the IDs of excluded
        commits prefixed with a "-" character.  This is used by
-       gitlink:git-pack-objects[1] to build "thin" pack, which records
+       linkgit:git-pack-objects[1] to build "thin" pack, which records
        objects in deltified form based on objects contained in these
        excluded commits to reduce network traffic.
 
@@ -450,4 +460,4 @@ and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite