From: Junio C Hamano Date: Mon, 11 Aug 2008 21:24:51 +0000 (-0700) Subject: Re-fix rev-list-options documentation X-Git-Tag: v1.6.0-rc3~1^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e534735a4cd778ac8172f543869a20894c1022a6;p=git.git 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 --- 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::