From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Aug 2008 21:28:35 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.0-rc3~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ac39efbdf3d41443c40166b7578b7fb87c2f3b60?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Re-fix rev-list-options documentation
---

ac39efbdf3d41443c40166b7578b7fb87c2f3b60
diff --combined Documentation/rev-list-options.txt
index 9e20713664,c953d1cac5..be84721781
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -45,10 -45,6 +45,10 @@@ endif::git-rev-list[
  
  	Print the parents of the commit.
  
 +--children::
 +
 +	Print the children of the commit.
 +
  ifdef::git-rev-list[]
  --timestamp::
  	Print the raw commit timestamp.
@@@ -267,8 -263,7 +267,7 @@@ used in the output.  When the starting 
  '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::