X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitk.txt;h=cf465cb47e1f3fbb7452568591874cf865a16c2c;hb=2464456a6ac9216d59d9e2cf0d86fee072f63cf8;hp=317f6317c254f0ec51c42c5485123aeb91ccd7c6;hpb=9b3b7fd8072783e2ec20b3cf622713d39b1c8af4;p=git.git

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 317f6317c..cf465cb47 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -21,7 +21,7 @@ git repository.
 
 OPTIONS
 -------
-To control which revisions to shown, the command takes options applicable to
+To control which revisions to show, the command takes options applicable to
 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,14 +74,14 @@ 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
 --------
 gitk v2.6.12.. include/scsi drivers/scsi::
 
-	Show as the changes since version 'v2.6.12' that changed any
+	Show the changes since version 'v2.6.12' that changed any
 	file in the include/scsi or drivers/scsi subdirectories
 
 gitk --since="2 weeks ago" \-- gitk::