aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rev-list.txt
diff options
context:
space:
mode:
authorUwe Zeisberger <Uwe_Zeisberger@digi.com>2006-08-04 10:11:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-08-04 02:08:02 -0700
commitd249b455475977f305240bb73473f25d040012cf (patch)
treec6be092cb75597eccaa42164e1c2320666c015f8 /Documentation/git-rev-list.txt
parentcba05fa840b637db2708014142a753680d930082 (diff)
downloadgit-d249b455475977f305240bb73473f25d040012cf.tar.gz
git-d249b455475977f305240bb73473f25d040012cf.tar.xz
Document rev-list's option --merge
Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rev-list.txt')
-rw-r--r--Documentation/git-rev-list.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index f60eacd93..dd9fff16d 100644
--- 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>