Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Document rev-list's option --merge
author
Uwe Zeisberger
<Uwe_Zeisberger@digi.com>
Fri, 4 Aug 2006 08:11:15 +0000
(10:11 +0200)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 4 Aug 2006 09:08:02 +0000
(
02:08
-0700)
Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-rev-list.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
cba05fa
)
diff --git
a/Documentation/git-rev-list.txt
b/Documentation/git-rev-list.txt
index f60eacd93e96a080689569b1afd6736c05554ab7..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
@@
-123,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>