From: Uwe Zeisberger Date: Fri, 04 Aug 2006 08:11:15 GMT Subject: [PATCH] Document rev-list's option --mergegit@vger.kernel.org Message-ID: <20060804081114.GA32338@digi.com> Signed-off-by: Uwe Zeisberger --- The description is not very verbose, but at least it is mentioned now. Documentation/git-rev-list.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index f60eacd..dd9fff1 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 ] ... [ \-- ... ] 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 -- 1.4.2.rc2.gb63f -- Uwe Zeisberger FS Forth-Systeme GmbH, A Digi International Company Kueferstrasse 8, D-79206 Breisach, Germany Phone: +49 (7667) 908 0 Fax: +49 (7667) 908 200 Web: www.fsforth.de, www.digi.com