Documentation gitk: Describe what --merge does
Signed-off-by: Richard Quirk <richard.quirk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Richard Quirk committed
Apr 28, 2008 at 22:58 UTC
9f1915d3935ea6e5e0a5cc38355a2dc30c4a811f
1 file changed
+6
Documentation/gitk.txt
+6
@@ -41,6 +41,12 @@ frequently used options.
41
42
Show all branches.
43
44
+--merge::
45
+
46
+ After an attempt to merge stops with conflicts, show the commits on
47
+ the history between two branches (i.e. the HEAD and the MERGE_HEAD)
48
+ that modify the conflicted files.
49
+
50
<revs>::
51
52
Limit the revisions to show. This can be either a single revision