From af894943cb9dbad1d6892dc983dc6ac0fa6ca8e8 Mon Sep 17 00:00:00 2001 From: Soeren Finster Date: Mon, 7 Jul 2008 18:50:13 +0200 Subject: git-gui: Exit shortcut in MacOSX repaired Now, as in all OSX apps, there is only one quit menu entry. It's automatically in the wish menu and calls ::tk::mac::Quit when used. Signed-off-by: Soeren Finster Signed-off-by: Shawn O. Pearce --- git-gui.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index d89f156fd5..940677cbd8 100755 --- a/git-gui.sh +++ b/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 # -- cgit v1.2.3 From f049e0944d32715ee8893d290d1c52888216fbe4 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 12 Jul 2008 15:56:59 +0100 Subject: git-gui: MERGE_RR lives in .git/ directly with newer Git versions Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete it somewhere else. Just in case somebody wants to use a newer git-gui with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if it exists). Signed-off-by: Johannes Schindelin Signed-off-by: Shawn O. Pearce --- lib/merge.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/merge.tcl b/lib/merge.tcl index cc26b07808..5c01875b05 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -257,6 +257,7 @@ proc _reset_wait {fd} { catch {file delete [gitdir MERGE_HEAD]} catch {file delete [gitdir rr-cache MERGE_RR]} + catch {file delete [gitdir MERGE_RR]} catch {file delete [gitdir SQUASH_MSG]} catch {file delete [gitdir MERGE_MSG]} catch {file delete [gitdir GITGUI_MSG]} -- cgit v1.2.3