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

git-gui: Bind Ctrl/Cmd-M to merge action

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce
2007-07-19 00:39:23 -04:00
parent dc5ccdc6ca
commit a870ddc099
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-gui.sh
View File

@ -1846,14 +1846,14 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
if {[is_enabled branch]} { if {[is_enabled branch]} {
menu .mbar.merge menu .mbar.merge
.mbar.merge add command -label {Local Merge...} \ .mbar.merge add command -label {Local Merge...} \
-command merge::dialog -command merge::dialog \
-accelerator $M1T-M
lappend disable_on_lock \ lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state] [list .mbar.merge entryconf [.mbar.merge index last] -state]
.mbar.merge add command -label {Abort Merge...} \ .mbar.merge add command -label {Abort Merge...} \
-command merge::reset_hard -command merge::reset_hard
lappend disable_on_lock \ lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state] [list .mbar.merge entryconf [.mbar.merge index last] -state]
} }
# -- Transport Menu # -- Transport Menu
@ -2508,6 +2508,8 @@ if {[is_enabled branch]} {
bind . <$M1B-Key-N> branch_create::dialog bind . <$M1B-Key-N> branch_create::dialog
bind . <$M1B-Key-o> branch_checkout::dialog bind . <$M1B-Key-o> branch_checkout::dialog
bind . <$M1B-Key-O> branch_checkout::dialog bind . <$M1B-Key-O> branch_checkout::dialog
bind . <$M1B-Key-m> merge::dialog
bind . <$M1B-Key-M> merge::dialog
} }
if {[is_enabled transport]} { if {[is_enabled transport]} {
bind . <$M1B-Key-p> do_push_anywhere bind . <$M1B-Key-p> do_push_anywhere