From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 6 Jul 2007 08:03:24 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~16^2~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8186e92e3399ddd742f2397e802467cabf2849f;p=git.git

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
---

f8186e92e3399ddd742f2397e802467cabf2849f
diff --cc git-gui.sh
index 8ee680221,c38aa067a..0096f4913
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -1559,9 -1525,8 +1559,10 @@@ 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
  }
  
  if {[is_MacOSX]} {