From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 19 Jul 2007 04:39:23 +0000 (-0400)
Subject: git-gui: Bind Ctrl/Cmd-M to merge action
X-Git-Tag: gitgui-0.8.0~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a870ddc0997881d5e73c0ec4562f3521274c5960;p=git.git

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

diff --git a/git-gui.sh b/git-gui.sh
index 7b6a96e4f..0aabfba6b 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