X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitk.txt;h=99baa24a2d5c8c703d3ad5ce7442bb8363359cd6;hb=d3b91fad1843e98fde9c287f72315bd456e18f2c;hp=4673a75a98da1f778c1323d8e5a4f7faff388589;hpb=dfe50511c7e5ec2bc771c9a5f4c3318332a7744e;p=git.git

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 4673a75a9..99baa24a2 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -22,7 +22,7 @@ git repository.
 OPTIONS
 -------
 To control which revisions to show, the command takes options applicable to
-the 'git-rev-list' command (see linkgit:git-rev-list[1]).
+the 'git rev-list' command (see linkgit:git-rev-list[1]).
 This manual page describes only the most
 frequently used options.
 
@@ -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
@@ -73,7 +74,7 @@ frequently used options.
 <path>...::
 
 	Limit commits to the ones touching files in the given paths. Note, to
-	avoid ambiguity wrt. revision names use "--" to separate the paths
+	avoid ambiguity with respect to revision names use "--" to separate the paths
 	from any preceding options.
 
 Examples