summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-19 04:39:23 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-19 04:39:23 (GMT)
commita870ddc0997881d5e73c0ec4562f3521274c5960 (patch)
tree179f209599bbab35650af5c337af4bb793c1781a /git-gui.sh
parentdc5ccdc6cab41e8a4b2ace991b1564fe9bdd172d (diff)
downloadgit-a870ddc0997881d5e73c0ec4562f3521274c5960.zip
git-a870ddc0997881d5e73c0ec4562f3521274c5960.tar.gz
git-a870ddc0997881d5e73c0ec4562f3521274c5960.tar.bz2
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>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 7b6a96e..0aabfba 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1846,14 +1846,14 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
if {[is_enabled branch]} {
menu .mbar.merge
.mbar.merge add command -label {Local Merge...} \
- -command merge::dialog
+ -command merge::dialog \
+ -accelerator $M1T-M
lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state]
.mbar.merge add command -label {Abort Merge...} \
-command merge::reset_hard
lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state]
-
}
# -- Transport Menu
@@ -2508,6 +2508,8 @@ if {[is_enabled branch]} {
bind . <$M1B-Key-N> branch_create::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]} {
bind . <$M1B-Key-p> do_push_anywhere