diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-22 03:05:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-22 03:05:34 -0700 |
| commit | 00cec846f157b5363b0967d1e4cba76b44d48e77 (patch) | |
| tree | 6b0310d00c32fab34c6ab98abb6d9319338375f5 | |
| parent | Merge branch 'maint' (diff) | |
| parent | [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk (diff) | |
| download | tgif-00cec846f157b5363b0967d1e4cba76b44d48e77.tar.xz | |
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
| -rwxr-xr-x | gitk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 } |