git-gui: Bind Ctrl/Cmd-M to merge action
Users who merge often may want to access the merge action quickly, so we now bind M to the merge action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Jul 19, 2007 at 00:39 UTC
a870ddc0997881d5e73c0ec4562f3521274c5960
1 file changed
+4
-2
git-gui.sh
+4
-2
@@ -1846,14 +1846,14 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1846
if {[is_enabled branch]} {
1847
menu .mbar.merge
1848
.mbar.merge add command -label {Local Merge...} \
1849
- -command merge::dialog
1849
+ -command merge::dialog \
1850
+ -accelerator $M1T-M
1851
lappend disable_on_lock \
1852
[list .mbar.merge entryconf [.mbar.merge index last] -state]
1853
.mbar.merge add command -label {Abort Merge...} \
1854
-command merge::reset_hard
1855
lappend disable_on_lock \
1856
[list .mbar.merge entryconf [.mbar.merge index last] -state]
1856
-
1857
}
1858
1859
# -- Transport Menu
@@ -2508,6 +2508,8 @@ if {[is_enabled branch]} {
2508
bind . <$M1B-Key-N> branch_create::dialog
2509
bind . <$M1B-Key-o> branch_checkout::dialog
2510
bind . <$M1B-Key-O> branch_checkout::dialog
2511
+ bind . <$M1B-Key-m> merge::dialog
2512
+ bind . <$M1B-Key-M> merge::dialog
2513
}
2514
if {[is_enabled transport]} {
2515
bind . <$M1B-Key-p> do_push_anywhere