diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 23:58:11 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-11 23:58:11 -0400 |
| commit | 03e1bed4a4887607ae90cd121cb4851d10ef2e8b (patch) | |
| tree | 166e015cd8b842fd28ddb138faa2ff7213528294 /git-gui.sh | |
| parent | aa751960178af04673f88adca4988f94ffd7f2dc (diff) | |
| parent | 39fa2a983d55b37759b99e67f9f1892879efb775 (diff) | |
| download | git-03e1bed4a4887607ae90cd121cb4851d10ef2e8b.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Save geometry before the window layout is damaged
git-gui: Give amend precedence to HEAD over MERGE_MSG
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index e33ee03bc0..3237f3d596 100755 --- a/git-gui.sh +++ b/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]} |