diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-06 04:03:24 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-06 04:03:24 -0400 |
| commit | f8186e92e3399ddd742f2397e802467cabf2849f (patch) | |
| tree | 161205087594eacf3de71afcc1a003077375c09e | |
| parent | 1eb96a25c9e76b70ca3f335bce7e60d66220eaa9 (diff) | |
| parent | 47282d4646372aa859908c3b9471b96c385abe5f (diff) | |
| download | git-f8186e92e3399ddd742f2397e802467cabf2849f.tar.gz git-f8186e92e3399ddd742f2397e802467cabf2849f.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Ensure windows shortcuts always have .bat extension
git-gui: Include a Push action on the left toolbar
git-gui: Bind M1-P to push action
git-gui: Don't bind F5/M1-R in all windows
Conflicts:
git-gui.sh
| -rwxr-xr-x | git-gui.sh | 17 | ||||
| -rw-r--r-- | lib/shortcut.tcl | 6 |
2 files changed, 19 insertions, 4 deletions
diff --git a/git-gui.sh b/git-gui.sh index 8ee680221..0096f4913 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1559,7 +1559,8 @@ if {[is_enabled transport]} { menu .mbar.push .mbar.push add command -label {Push...} \ - -command do_push_anywhere + -command do_push_anywhere \ + -accelerator $M1T-P .mbar.push add command -label {Delete...} \ -command remote_branch_delete::dialog } @@ -1849,6 +1850,10 @@ pack .vpane.lower.commarea.buttons.commit -side top -fill x lappend disable_on_lock \ {.vpane.lower.commarea.buttons.commit conf -state} +button .vpane.lower.commarea.buttons.push -text {Push} \ + -command do_push_anywhere +pack .vpane.lower.commarea.buttons.push -side top -fill x + # -- Commit Message Buffer # frame .vpane.lower.commarea.buffer @@ -2176,10 +2181,14 @@ if {[is_enabled branch]} { bind . <$M1B-Key-n> do_create_branch bind . <$M1B-Key-N> do_create_branch } +if {[is_enabled transport]} { + bind . <$M1B-Key-p> do_push_anywhere + bind . <$M1B-Key-P> do_push_anywhere +} -bind all <Key-F5> do_rescan -bind all <$M1B-Key-r> do_rescan -bind all <$M1B-Key-R> do_rescan +bind . <Key-F5> do_rescan +bind . <$M1B-Key-r> do_rescan +bind . <$M1B-Key-R> do_rescan bind . <$M1B-Key-s> do_signoff bind . <$M1B-Key-S> do_signoff bind . <$M1B-Key-i> do_add_all diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl index ebf72e445..a0a1b7ddd 100644 --- a/lib/shortcut.tcl +++ b/lib/shortcut.tcl @@ -9,6 +9,9 @@ proc do_windows_shortcut {} { -title "[appname] ([reponame]): Create Desktop Icon" \ -initialfile "Git [reponame].bat"] if {$fn != {}} { + if {[file extension $fn] ne {.bat}} { + set fn ${fn}.bat + } if {[catch { set fd [open $fn w] puts $fd "@ECHO Entering [reponame]" @@ -42,6 +45,9 @@ proc do_cygwin_shortcut {} { -initialdir $desktop \ -initialfile "Git [reponame].bat"] if {$fn != {}} { + if {[file extension $fn] ne {.bat}} { + set fn ${fn}.bat + } if {[catch { set fd [open $fn w] set sh [exec cygpath \ |