summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-list.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-rev-list.txt')
-rw-r--r--Documentation/git-rev-list.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 1c1978140f..7cd0e8913e 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -113,7 +113,7 @@ e.g. "2 hours ago".
`--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).
@@ -299,6 +299,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.
+Cannot be combined with '\--reverse'.
+
--merge::
After a failed merge, show refs that touch files having a
@@ -373,6 +375,7 @@ By default, the commits are shown in reverse chronological order.
--reverse::
Output the commits in reverse order.
+ Cannot be combined with '\--walk-reflogs'.
Object Traversal
~~~~~~~~~~~~~~~~