{"thread":{"id":"5115","subject":"[PATCH] Document rev-list's option --mergegit@vger.kernel.org","startedAt":"2006-08-04T08:11:15Z","lastAt":"2006-08-04T08:11:15Z","messageCount":1,"participants":["Uwe Zeisberger"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"24693","messageId":"20060804081114.GA32338@digi.com","threadId":"5115","inReplyTo":null,"subject":"[PATCH] Document rev-list's option --mergegit@vger.kernel.org","fromName":"Uwe Zeisberger","fromEmail":"uwe_zeisberger@digi.com","sentAt":"2006-08-04T08:11:15Z","receivedAt":"2006-08-04T08:11:15Z","isPatch":true,"sender":{"key":"uwe_zeisberger@digi.com","avatar":null},"body":"Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>\n---\nThe description is not very verbose, but at least it is mentioned now.\n\n Documentation/git-rev-list.txt |    5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt\nindex f60eacd..dd9fff1 100644\n--- a/Documentation/git-rev-list.txt\n+++ b/Documentation/git-rev-list.txt\n@@ -22,6 +22,7 @@ SYNOPSIS\n \t     [ [\\--objects | \\--objects-edge] [ \\--unpacked ] ]\n \t     [ \\--pretty | \\--header ]\n \t     [ \\--bisect ]\n+\t     [ \\--merge ]\n \t     <commit>... [ \\-- <paths>... ]\n \n DESCRIPTION\n@@ -123,6 +124,10 @@ OPTIONS\n \ttopological order (i.e. descendant commits are shown\n \tbefore their parents).\n \n+--merge::\n+\tAfter a failed merge, show refs that touch files having a\n+\tconflict and don't exist on all heads to merge.\n+\n Author\n ------\n Written by Linus Torvalds <torvalds@osdl.org>\n-- \n1.4.2.rc2.gb63f\n\n\n-- \nUwe Zeisberger\nFS Forth-Systeme GmbH, A Digi International Company\nKueferstrasse 8, D-79206 Breisach, Germany\nPhone: +49 (7667) 908 0 Fax: +49 (7667) 908 200\nWeb: www.fsforth.de, www.digi.com\n"}]}