diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-07-19 00:39:23 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-07-19 00:39:23 -0400 |
| commit | a870ddc0997881d5e73c0ec4562f3521274c5960 (patch) | |
| tree | 179f209599bbab35650af5c337af4bb793c1781a | |
| parent | dc5ccdc6cab41e8a4b2ace991b1564fe9bdd172d (diff) | |
| download | git-a870ddc0997881d5e73c0ec4562f3521274c5960.tar.xz | |
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>
| -rwxr-xr-x | git-gui.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index 7b6a96e4f2..0aabfba6b7 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 |