Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Fri, 6 Jul 2007 08:03:24 +0000 (04:03 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 6 Jul 2007 08:03:24 +0000 (04:03 -0400)
* 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

1  2 
git-gui.sh
diff --cc git-gui.sh
index 8ee680221d9ab7602a6ea9c87d84ab38a3f1e987,c38aa067acf12135fbd203b028326dddbad97448..0096f4913aa03bada1cfde879478926c5fe9ec06
@@@ -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]} {