Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack git-gui: Don't nice git blame on MSYS as nice is not supported git-gui: Don't require $DISPLAY just to get --version git-gui: Quiet our installation process git-gui: Bind Tab/Shift-Tab to cycle between panes in blame git-gui: Correctly install to /usr/bin on Cygwin
This commit is contained in:
@ -1,6 +1,12 @@
|
||||
#!/bin/sh
|
||||
# Tcl ignores the next line -*- tcl -*- \
|
||||
exec wish "$0" -- "$@"
|
||||
if test "z$*" = zversion \
|
||||
|| test "z$*" = z--version; \
|
||||
then \
|
||||
echo 'git-gui version @@GITGUI_VERSION@@'; \
|
||||
exit; \
|
||||
fi; \
|
||||
exec wish "$0" -- "$@"
|
||||
|
||||
set appvers {@@GITGUI_VERSION@@}
|
||||
set copyright {
|
||||
@ -302,11 +308,6 @@ proc tk_optionMenu {w varName args} {
|
||||
##
|
||||
## version check
|
||||
|
||||
if {{--version} eq $argv || {version} eq $argv} {
|
||||
puts "git-gui version $appvers"
|
||||
exit
|
||||
}
|
||||
|
||||
set req_maj 1
|
||||
set req_min 5
|
||||
|
||||
@ -1580,8 +1581,7 @@ if {[is_MacOSX]} {
|
||||
|
||||
# -- Tools Menu
|
||||
#
|
||||
if {[file exists /usr/local/miga/lib/gui-miga]
|
||||
&& [file exists .pvcsrc]} {
|
||||
if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
|
||||
proc do_miga {} {
|
||||
global ui_status_value
|
||||
if {![lock_index update]} return
|
||||
|
||||
Reference in New Issue
Block a user