development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Document rev-list's option --merge

Browse source 
Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Uwe Zeisberger 2006-08-04 10:11:15 +02:00 committed by Junio C Hamano
parent cba05fa840
commit d249b45547
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-rev-list.txt
View file

@ -22,6 +22,7 @@ SYNOPSIS
[ [\--objects | \--objects-edge] [ \--unpacked ] ] [ [\--objects | \--objects-edge] [ \--unpacked ] ]
[ \--pretty | \--header ] [ \--pretty | \--header ]
[ \--bisect ] [ \--bisect ]
[ \--merge ]
<commit>... [ \-- <paths>... ] <commit>... [ \-- <paths>... ]
DESCRIPTION DESCRIPTION
@ -123,6 +124,10 @@ OPTIONS
topological order (i.e. descendant commits are shown topological order (i.e. descendant commits are shown
before their parents). 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 Author
------ ------
Written by Linus Torvalds <torvalds@osdl.org> Written by Linus Torvalds <torvalds@osdl.org>