From 1c16af443e359ccf5ee6eb1967c1e1157e3af78b Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sat, 7 Jul 2018 11:26:05 +0300
Subject: [PATCH] Assign default shortcut for Git | Branches (IDEA-190367)

Alt+Shift+Backquote on Windows/Linux.
Ctrl+B on Mac: was assigned to "EditorLeft" in Emacs-style, but nobody actually uses it.
Emacs keymap has a duplicate definition for this action and shortcut, so it won't be affected.
---
 platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml | 4 ----
 plugins/git4idea/src/META-INF/plugin.xml                   | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml b/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml
index 15a734b438d2..bed6b1bb5e1e 100644
--- a/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml	
+++ b/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml	
@@ -538,11 +538,9 @@
   </action>
   <action id="EditorDown">
     <keyboard-shortcut first-keystroke="DOWN"/>
-    <keyboard-shortcut first-keystroke="control N"/>
   </action>
   <action id="EditorLeft">
     <keyboard-shortcut first-keystroke="LEFT"/>
-    <keyboard-shortcut first-keystroke="control B"/>
   </action>
   <action id="EditorLineEnd">
     <keyboard-shortcut first-keystroke="END"/>
@@ -556,14 +554,12 @@
   </action>
   <action id="EditorRight">
     <keyboard-shortcut first-keystroke="RIGHT"/>
-    <keyboard-shortcut first-keystroke="control F"/>
   </action>
   <action id="EditorToggleColumnMode">
     <keyboard-shortcut first-keystroke="shift meta 8"/>
   </action>
   <action id="EditorUp">
     <keyboard-shortcut first-keystroke="UP"/>
-    <keyboard-shortcut first-keystroke="control P"/>
   </action>
 
   <action id="UsageView.Include">
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index 055430cdea0f..be7b73d55892 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -77,7 +77,10 @@
     </group>
 
     <group id="GitRepositoryActions">
-      <action id="Git.Branches" class="git4idea.ui.branch.GitBranchesAction" text="_Branches..." icon="VcsLogIcons.Branch"/>
+      <action id="Git.Branches" class="git4idea.ui.branch.GitBranchesAction" text="_Branches..." icon="VcsLogIcons.Branch">
+        <keyboard-shortcut first-keystroke="alt shift BACK_QUOTE" keymap="$default" />
+        <keyboard-shortcut first-keystroke="control B" keymap="Mac OS X 10.5+"/>
+      </action>
       <action id="Git.Tag" class="git4idea.actions.GitTag" text="Tag..."/>
       <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="AllIcons.Actions.ShowAsTree"/>
       <action id="Git.Stash" class="git4idea.actions.GitStash" text="Stash Changes..."/>