Documentation: clarify commits affected by gitk --merge
authorSitaram Chamarty <sitaramc@gmail.com>
Fri, 6 Feb 2009 04:40:53 +0000 (10:10 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Feb 2009 05:21:28 +0000 (21:21 -0800)
Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitk.txt

index 4673a75a98da1f778c1323d8e5a4f7faff388589..bd005bc5c8c7d877ea9de79e2f6452d5703d0892 100644 (file)
@@ -47,7 +47,8 @@ frequently used options.
 
        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.
+       that modify the conflicted files and do not exist on all the heads
+       being merged.
 
 --argscmd=<command>::
        Command to be run each time gitk has to determine the list of