diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-27 23:09:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-27 23:09:25 +0200 |
| commit | 392f1300911120fbaa4b77c737fe13e205726aca (patch) | |
| tree | 15e0e21eeef25ca4e49d1d413d85c9885338bf15 /git-gui/macosx | |
| parent | git-reset: Let -q hush "locally modified" messages (diff) | |
| parent | git-gui: "Stage Line": Treat independent changes in adjacent lines better (diff) | |
| download | git-392f1300911120fbaa4b77c737fe13e205726aca.tar.xz git-392f1300911120fbaa4b77c737fe13e205726aca.zip | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: "Stage Line": Treat independent changes in adjacent lines better
git-gui: Fix "Stage/Unstage Line" with one line of context.
git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk
git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core
Add a menu item to invoke full copy detection in blame.
Kill the blame back-end on window close.
Add options to control the search for copies in blame.
Fix pre-commit hooks under MinGW/MSYS
Diffstat (limited to 'git-gui/macosx')
| -rw-r--r-- | git-gui/macosx/AppMain.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/macosx/AppMain.tcl b/git-gui/macosx/AppMain.tcl index 41ca08e2b7..ddbe6334a2 100644 --- a/git-gui/macosx/AppMain.tcl +++ b/git-gui/macosx/AppMain.tcl @@ -7,7 +7,7 @@ if {[string first -psn [lindex $argv 0]] == 0} { } if {[file tail [lindex $argv 0]] eq {gitk}} { - set argv0 [file join $gitexecdir gitk] + set argv0 [lindex $argv 0] set AppMain_source $argv0 } else { set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]] |