X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Fgit-gui.sh;h=3237f3d59627d60e3d5ac18ee588a61b0ce87576;hb=1924d64f6e070edf1ad1949bf2eb95d4d2451f30;hp=e33ee03bc0b1881596115da73c875ef784cd0a93;hpb=75d8ff138dd640a117c6aaa625d0f6b835adbd3a;p=git.git

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index e33ee03bc..3237f3d59 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -494,7 +494,8 @@ proc rescan {after {honor_trustmtime 1}} {
 
 	if {![$ui_comm edit modified]
 		|| [string trim [$ui_comm get 0.0 end]] eq {}} {
-		if {[load_message GITGUI_MSG]} {
+		if {[string match amend* $commit_type]} {
+		} elseif {[load_message GITGUI_MSG]} {
 		} elseif {[load_message MERGE_MSG]} {
 		} elseif {[load_message SQUASH_MSG]} {
 		}
@@ -1657,7 +1658,7 @@ unset browser doc_path doc_url
 
 # -- Standard bindings
 #
-bind .   <Destroy> {if {{%W} eq {.}} do_quit}
+wm protocol . WM_DELETE_WINDOW do_quit
 bind all <$M1B-Key-q> do_quit
 bind all <$M1B-Key-Q> do_quit
 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}