Documentation gitk: Describe what --merge does

Signed-off-by: Richard Quirk <richard.quirk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago · 9f1915d393
1 changed files with 6 additions and 0 deletions
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@ -41,6 +41,12 @@ frequently used options.
				@@ -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