From 92cc059453c07bc378d4835ca0722ab077073e8d Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 4 Dec 2018 18:35:02 +0300
Subject: [PATCH] git: move "Checkout and Rebase onto Current" to the
 "Checkout" group

It is more about checkout, than about rebase, so it is more logical to store the action along other Checkout actions. Proposed in IDEA-155587.
---
 .../git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
index 54cdb22ba9af..3b18808471e7 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopupActions.java
@@ -272,11 +272,11 @@ class GitBranchPopupActions {
       return new AnAction[]{
         new CheckoutAction(myProject, myRepositories, myBranchName),
         new CheckoutAsNewBranch(myProject, myRepositories, myBranchName),
+        new CheckoutWithRebaseAction(myProject, myRepositories, myBranchName),
         new Separator(),
         new CompareAction(myProject, myRepositories, myBranchName, mySelectedRepository),
         new Separator(),
         new RebaseAction(myProject, myRepositories, myBranchName),
-        new CheckoutWithRebaseAction(myProject, myRepositories, myBranchName),
         new MergeAction(myProject, myRepositories, myBranchName, true),
         new Separator(),
         new RenameBranchAction(myProject, myRepositories, myBranchName),