Evil Merge branch 'jc/status' (early part) into js/diff-ni

[git.git] / Documentation / git-rev-list.txt

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 28966adbbce60c2d3fa02f47bf0797bc29d32f60..4f145eaba47175e48dd592ffe5018be5cb4cb375 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git-rev-list' [ \--max-count=number ]
 --------
 [verse]
 'git-rev-list' [ \--max-count=number ]

+            [ \--skip=number ]

             [ \--max-age=timestamp ]
             [ \--min-age=timestamp ]
             [ \--sparse ]
             [ \--max-age=timestamp ]
             [ \--min-age=timestamp ]
             [ \--sparse ]


@@ -20,10 +21,14 @@ SYNOPSIS
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]
             [ \--stdin ]
             [ \--topo-order ]
             [ \--parents ]

+            [ \--encoding[=<encoding>] ]
+            [ \--(author|committer|grep)=<pattern> ]

             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--merge ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--merge ]

+            [ \--reverse ]
+            [ \--walk-reflogs ]

             <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
             <commit>... [ \-- <paths>... ]
 
 DESCRIPTION


@@ -78,11 +83,7 @@ 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]
 
 more specialized family of commit log tools: gitlink:git-log[1],
 gitlink:git-show[1], and gitlink:git-whatchanged[1]
 

---pretty[='<format>']::
-
-       Pretty print the contents of the commit logs in a given format,
-       where '<format>' can be one of 'raw', 'medium', 'short', 'full',
-       and 'oneline'. When left out the format default to 'medium'.
+include::pretty-formats.txt[]

 
 --relative-date::
 
 
 --relative-date::
 


@@ -142,6 +143,10 @@ limiting may be applied.
 
        Limit the number of commits output.
 
 
        Limit the number of commits output.
 

+--skip='number'::
+
+       Skip 'number' commits before starting to show the commit output.
+

 --since='date', --after='date'::
 
        Show commits more recent than a specific date.
 --since='date', --after='date'::
 
        Show commits more recent than a specific date.


@@ -154,6 +159,16 @@ limiting may be applied.
 
        Limit the commits output to specified time range.
 
 
        Limit the commits output to specified time range.
 

+--author='pattern', --committer='pattern'::
+
+       Limit the commits output to ones with author/committer
+       header lines that match the specified pattern.
+
+--grep='pattern'::
+
+       Limit the commits output to ones with log message that
+       matches the specified pattern.
+

 --remove-empty::
 
        Stop when a given path disappears from the tree.
 --remove-empty::
 
        Stop when a given path disappears from the tree.


@@ -177,6 +192,22 @@ limiting may be applied.
        In addition to the '<commit>' listed on the command
        line, read them from the standard input.
 
        In addition to the '<commit>' listed on the command
        line, read them from the standard input.
 

+-g, --walk-reflogs::
+
+       Instead of walking the commit ancestry chain, walk
+       reflog entries from the most recent one to older ones.
+       When this option is used you cannot specify commits to
+       exclude (that is, '{caret}commit', 'commit1..commit2',
+       nor 'commit1...commit2' notations cannot be used).
++
+With '\--pretty' format other than oneline (for obvious reasons),
+this causes the output to have two extra lines of information
+taken from the reflog.  By default, 'commit@{Nth}' notation is
+used in the output.  When the starting commit is specified as
+'commit@{now}', output also uses 'commit@{timestamp}' notation
+instead.  Under '\--pretty=oneline', the commit message is
+prefixed with this information on the same line.
+

 --merge::
 
        After a failed merge, show refs that touch files having a
 --merge::
 
        After a failed merge, show refs that touch files having a


@@ -236,6 +267,10 @@ By default, the commits are shown in reverse chronological order.
        parent comes before all of its children, but otherwise things
        are still ordered in the commit timestamp order.
 
        parent comes before all of its children, but otherwise things
        are still ordered in the commit timestamp order.
 

+--reverse::
+
+       Output the commits in reverse order.
+

 Object Traversal
 ~~~~~~~~~~~~~~~~
 
 Object Traversal
 ~~~~~~~~~~~~~~~~