summaryrefslogtreecommitdiffstats
path: root/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-08-11 22:03:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-08-11 22:03:10 +0000
commit1d36888341421a7ba59def87f39c3f7d25989e37 (patch)
tree2f8783d094385487b70cf32831a1400043e2eefa /rev-list-options.txt
parentfaa1e50737bfc349e8315c99a2ed59182fd557b1 (diff)
downloadgit-htmldocs-1d36888341421a7ba59def87f39c3f7d25989e37.tar.gz
Autogenerated HTML docs for v1.6.0-rc2-29-gac39e
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r--rev-list-options.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt
index 3aa38097e..be8472178 100644
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -264,11 +264,10 @@ 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
+'commit@\{now}', output also uses 'commit@\{timestamp}' notation
instead. Under '\--pretty=oneline', the commit message is
prefixed with this information on the same line.
-
-Cannot be combined with '\--reverse'.
+This option cannot be combined with '\--reverse'.
See also linkgit:git-reflog[1].
--merge::