Merge branch 'rs/pretty'

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

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 08e7573b9e1beffceef9d44b047cba3466653b22..485280423e90bac43b4c372bbc8d350c34cf4fa8 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -27,15 +27,18 @@ SYNOPSIS
             [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]

-            [ \--regexp-ignore-case ] [ \--extended-regexp ]
+            [ \--regexp-ignore-case | \-i ]
+            [ \--extended-regexp | \-E ]

             [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--bisect-vars ]
             [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
             [ \--bisect-vars ]

+            [ \--bisect-all ]

             [ \--merge ]
             [ \--reverse ]
             [ \--walk-reflogs ]
             [ \--merge ]
             [ \--reverse ]
             [ \--walk-reflogs ]

+            [ \--no-walk ] [ \--do-walk ]

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


@@ -111,7 +114,7 @@ e.g. "2 hours ago".
 `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
 format, often found in E-mail messages.
 +
 `--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822
 format, often found in E-mail messages.
 +

-`--date=short` shows only date but not time, in `YYYY-MM-DD` fomat.
+`--date=short` shows only date but not time, in `YYYY-MM-DD` format.

 +
 `--date=default` shows timestamps in the original timezone
 (either committer's or author's).
 +
 `--date=default` shows timestamps in the original timezone
 (either committer's or author's).


@@ -227,11 +230,11 @@ limiting may be applied.
        Limit the commits output to ones with log message that
        matches the specified pattern (regular expression).
 
        Limit the commits output to ones with log message that
        matches the specified pattern (regular expression).
 

---regexp-ignore-case::
+-i, --regexp-ignore-case::

 
        Match the regexp limiting patterns without regard to letters case.
 
 
        Match the regexp limiting patterns without regard to letters case.
 

---extended-regexp::
+-E, --extended-regexp::

 
        Consider the limiting patterns to be extended regular expressions
        instead of the default basic regular expressions.
 
        Consider the limiting patterns to be extended regular expressions
        instead of the default basic regular expressions.


@@ -297,6 +300,8 @@ used in the output.  When the starting commit is specified as
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
 
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
 

+Cannot be combined with '\--reverse'.
+

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


@@ -350,6 +355,21 @@ the expected number of commits to be tested if `bisect_rev`
 turns out to be bad to `bisect_bad`, and the number of commits
 we are bisecting right now to `bisect_all`.
 
 turns out to be bad to `bisect_bad`, and the number of commits
 we are bisecting right now to `bisect_all`.
 

+--bisect-all::
+
+This outputs all the commit objects between the included and excluded
+commits, ordered by their distance to the included and excluded
+commits. The farthest from them is displayed first. (This is the only
+one displayed by `--bisect`.)
+
+This is useful because it makes it easy to choose a good commit to
+test when you want to avoid to test some of them for some reason (they
+may not compile for example).
+
+This option can be used along with `--bisect-vars`, in this case,
+after all the sorted commit objects, there will be the same text as if
+`--bisect-vars` had been used alone.
+

 --
 
 Commit Ordering
 --
 
 Commit Ordering


@@ -371,6 +391,7 @@ By default, the commits are shown in reverse chronological order.
 --reverse::
 
        Output the commits in reverse order.
 --reverse::
 
        Output the commits in reverse order.

+       Cannot be combined with '\--walk-reflogs'.

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


@@ -397,6 +418,14 @@ These options are mostly targeted for packing of git repositories.
        Only useful with '--objects'; print the object IDs that are not
        in packs.
 
        Only useful with '--objects'; print the object IDs that are not
        in packs.
 

+--no-walk::
+
+       Only show the given revs, but do not traverse their ancestors.
+
+--do-walk::
+
+       Overrides a previous --no-walk.
+

 
 include::pretty-formats.txt[]
 
 
 include::pretty-formats.txt[]