Documentation: rev-list-options: Fix -g paragraph formatting

- Add an escape to @{now}.  Without the escape, the brace does
something magic and eats half the sentence up to the closing brace
at 'timestamp}'.

- Join the last paragraph with a '+'.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index f69260f4c04a83d4cdae2be733887bce63a6aa5d..56e2eca258d48721c5cbfefef844e0892954e005 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -260,10 +260,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
 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.
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.

-
++

 Cannot be combined with '\--reverse'.
 See also linkgit:git-reflog[1].
 
 Cannot be combined with '\--reverse'.
 See also linkgit:git-reflog[1].