From d249b455475977f305240bb73473f25d040012cf Mon Sep 17 00:00:00 2001
From: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Date: Fri, 4 Aug 2006 10:11:15 +0200
Subject: Document rev-list's option --merge

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 Documentation/git-rev-list.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Documentation/git-rev-list.txt')

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>
-- 
cgit v1.2.1