@matheusbsbs / matheus-bagliano / commits / d249b45547
Fork 0

Document rev-list's option --merge

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Uwe Zeisberger committed Aug 4, 2006 at 10:11 UTC d249b455475977f305240bb73473f25d040012cf
1 file changed +5
Documentation/git-rev-list.txt
+5
@@ -22,6 +22,7 @@ SYNOPSIS
22 [ [\--objects | \--objects-edge] [ \--unpacked ] ]
23 [ \--pretty | \--header ]
24 [ \--bisect ]
25 + [ \--merge ]
26 <commit>... [ \-- <paths>... ]
27
28 DESCRIPTION
@@ -123,6 +124,10 @@ OPTIONS
124 topological order (i.e. descendant commits are shown
125 before their parents).
126
127 +--merge::
128 + After a failed merge, show refs that touch files having a
129 + conflict and don't exist on all heads to merge.
130 +
131 Author
132 ------
133 Written by Linus Torvalds <torvalds@osdl.org>