From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Mar 2007 10:05:34 +0000 (-0700)
Subject: Merge git://git2.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.5.1-rc2~29
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/00cec846f157b5363b0967d1e4cba76b44d48e77?hp=aa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1

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
---

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
     }