summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 07:08:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-15 07:08:02 (GMT)
commit547905f8cd2a04b3e1117f00025b60f81aa60f47 (patch)
tree9e9421e597a9caecc6f16c3afd6a1b77abacabb9 /git-gui/git-gui.sh
parentebcffb1d44643bab69671abdf79209489e64dbef (diff)
parentf049e0944d32715ee8893d290d1c52888216fbe4 (diff)
downloadgit-547905f8cd2a04b3e1117f00025b60f81aa60f47.zip
git-547905f8cd2a04b3e1117f00025b60f81aa60f47.tar.gz
git-547905f8cd2a04b3e1117f00025b60f81aa60f47.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: MERGE_RR lives in .git/ directly with newer Git versions git-gui: Exit shortcut in MacOSX repaired
Diffstat (limited to 'git-gui/git-gui.sh')
-rwxr-xr-xgit-gui/git-gui.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index d89f156..940677c 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -1995,9 +1995,13 @@ if {[is_enabled multicommit]} {
}
}
-.mbar.repository add command -label [mc Quit] \
- -command do_quit \
- -accelerator $M1T-Q
+if {[is_MacOSX]} {
+ proc ::tk::mac::Quit {args} { do_quit }
+} else {
+ .mbar.repository add command -label [mc Quit] \
+ -command do_quit \
+ -accelerator $M1T-Q
+}
# -- Edit Menu
#