diff options
| author | Matthias Sohn | 2011-07-03 00:16:28 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-07-03 00:16:28 +0000 |
| commit | 66d9aa2a1cb94641a51532b2bb52c409a12d7b2c (patch) | |
| tree | 97a3f30b07aa2b89c52198b511a3fc288af2e532 | |
| parent | 2fbe581a84e30ea272fb8509338b6ac487b6069c (diff) | |
| download | egit-66d9aa2a1cb94641a51532b2bb52c409a12d7b2c.tar.gz egit-66d9aa2a1cb94641a51532b2bb52c409a12d7b2c.tar.xz egit-66d9aa2a1cb94641a51532b2bb52c409a12d7b2c.zip | |
Fix key binding conflicts
Redefine key binding for commit command to "Ctrl + #" ("Cmd + #" on Mac)
and remove conflicting key bindings for merge and ignore commands as
they are not that frequently needed. The merge command is also available
in the Git toolbar.
Bug: 314096
Bug: 321739
Bug: 337028
Change-Id: I01bc77b041b6ab17f9e6a192519aa5577001065a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index 3ea3779851..3ab1a9493b 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -3493,17 +3493,7 @@ commandId="org.eclipse.egit.ui.team.Commit" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="M1+M3+C"> - </key> - <key - commandId="org.eclipse.egit.ui.team.Ignore" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="M1+M3+I"> - </key> - <key - commandId="org.eclipse.egit.ui.team.Merge" - schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" - sequence="M1+M3+M"> + sequence="M1+#"> </key> <key commandId="org.eclipse.egit.ui.RepositoriesViewPaste" |