From: Thomas Rast Date: Sun, 10 Aug 2008 13:04:34 +0000 (+0200) Subject: Documentation: rev-list-options: Fix -g paragraph formatting X-Git-Tag: v1.6.0-rc3~1^2~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=18a2197;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index f69260f4c..56e2eca25 100644 --- 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 -'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'. See also linkgit:git-reflog[1].