aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-11 14:24:51 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-11 14:24:51 -0700
commite534735a4cd778ac8172f543869a20894c1022a6 (patch)
tree7be5d9660e42a71205dead27e33d8212732c6176
parent4f80b27d48fee1c588810f3341ffe5d14558cea2 (diff)
downloadgit-e534735a4cd778ac8172f543869a20894c1022a6.tar.gz
git-e534735a4cd778ac8172f543869a20894c1022a6.tar.xz
Re-fix rev-list-options documentation
18a2197 (Documentation: rev-list-options: Fix -g paragraph formatting, 2008-08-10) introduced the third paragraph that is continued, but it seems to confuse docbook toolchain on FC9 machines. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/rev-list-options.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 56e2eca25..c953d1cac 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -263,8 +263,7 @@ 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.
-+
-Cannot be combined with '\--reverse'.
+This option cannot be combined with '\--reverse'.
See also linkgit:git-reflog[1].
--merge::