Merge branch 'maint'

* maint:
  Re-fix rev-list-options documentation
This commit is contained in:
Junio C Hamano
2008-08-11 14:28:35 -07:00

View File

@ -267,8 +267,7 @@ 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 instead. Under '\--pretty=oneline', the commit message is
prefixed with this information on the same line. prefixed with this information on the same line.
+ This option cannot be combined with '\--reverse'.
Cannot be combined with '\--reverse'.
See also linkgit:git-reflog[1]. See also linkgit:git-reflog[1].
--merge:: --merge::