Merge git://git2.kernel.org/pub/scm/gitk/gitk

* git://git2.kernel.org/pub/scm/gitk/gitk:
  [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk

1 files changed, 2 insertions, 2 deletions

diff --git a/gitk b/gitk
index 1cd2a8f528..db28d745dc 100755
--- a/gitk
+++ b/gitk
@@ -1906,7 +1906,7 @@ proc do_file_hl {serial} {
     } else {
 	set gdtargs [list "-S$highlight_files"]
     }
-    set cmd [concat | git-diff-tree -r -s --stdin $gdtargs]
+    set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
     set filehighlight [open $cmd r+]
     fconfigure $filehighlight -blocking 0
     fileevent $filehighlight readable readfhighlight
@@ -1958,7 +1958,7 @@ proc readfhighlight {} {
     }
     if {[eof $filehighlight]} {
 	# strange...
-	puts "oops, git-diff-tree died"
+	puts "oops, git diff-tree died"
 	catch {close $filehighlight}
 	unset filehighlight
     }