From: Richard Quirk <richard.quirk@gmail.com>
Date: Mon, 28 Apr 2008 20:58:35 +0000 (+0200)
Subject: Documentation gitk: Describe what --merge does
X-Git-Tag: v1.5.6-rc0~111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f;p=git.git

Documentation gitk: Describe what --merge does

Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index ed3ba83c5..50d12da89 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -41,6 +41,12 @@ frequently used options.
 
 	Show all branches.
 
+--merge::
+
+	After an attempt to merge stops with conflicts, show the commits on
+	the history between two branches (i.e. the HEAD and the MERGE_HEAD)
+	that modify the conflicted files.
+
 <revs>::
 
 	Limit the revisions to show. This can be either a single revision