mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Save geometry before the window layout is damaged
  git-gui: Give amend precedence to HEAD over MERGE_MSG
This commit is contained in:
Shawn O. Pearce
2007-06-11 23:58:11 -04:00
parent aa75196017 39fa2a983d
commit 03e1bed4a4
8 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-gui.sh
View File

@ -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]}