git-apply --reject: finishing touches.

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index e220842981627d659a0a9b91a0778b0ef469c2af..dd9fff16d3067fe939642170258fffc427c77729 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -22,6 +22,7 @@ SYNOPSIS
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--bisect ]
+            [ \--merge ]
             <commit>... [ \-- <paths>... ]
 
 DESCRIPTION
@@ -56,6 +57,9 @@ OPTIONS
        Print the contents of the commit in raw-format; each
        record is separated with a NUL character.
 
+--parents::
+       Print the parents of the commit.
+
 --objects::
        Print the object IDs of any object referenced by the listed commits.
        'git-rev-list --objects foo ^bar' thus means "send me all object IDs
@@ -102,6 +106,9 @@ OPTIONS
 --remove-empty::
        Stop when a given path disappears from the tree.
 
+--no-merges::
+       Do not print commits with more than one parent.
+
 --not::
        Reverses the meaning of the '{caret}' prefix (or lack
        thereof) for all following revision specifiers, up to
@@ -117,6 +124,10 @@ OPTIONS
        topological order (i.e. descendant commits are shown
        before their parents).
 
+--merge::
+       After a failed merge, show refs that touch files having a
+       conflict and don't exist on all heads to merge.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>