From: Sitaram Chamarty Date: Fri, 6 Feb 2009 04:40:53 +0000 (+0530) Subject: Documentation: clarify commits affected by gitk --merge X-Git-Tag: v1.6.2-rc1~51 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3021faf6562690658d0b9f9fdd7cbe8c9dd61628;p=git.git Documentation: clarify commits affected by gitk --merge Signed-off-by: Sitaram Chamarty Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 4673a75a9..bd005bc5c 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -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 to be run each time gitk has to determine the list of