diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:14:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 00:14:47 -0700 |
| commit | 1924d64f6e070edf1ad1949bf2eb95d4d2451f30 (patch) | |
| tree | af77317e800b35c312ef562ffb72fa7c045af738 /git-gui/git-gui.sh | |
| parent | 75d8ff138dd640a117c6aaa625d0f6b835adbd3a (diff) | |
| parent | 03e1bed4a4887607ae90cd121cb4851d10ef2e8b (diff) | |
| download | git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.gz git-1924d64f6e070edf1ad1949bf2eb95d4d2451f30.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
git-gui: Include 'war on whitespace' fixes from git.git
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 5 |
1 files changed, 3 insertions, 2 deletions
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]} |