Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Stocker2012-09-02 17:37:25 -0400
committerMatthias Sohn2012-09-02 17:37:25 -0400
commit03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee (patch)
tree81abe7c1c899ebd935350eafb5791fbf5a156c3a /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parentfa2f9bf5afb9e111f496acd42dcca2696b0120fc (diff)
downloadegit-03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee.tar.gz
egit-03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee.tar.xz
egit-03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee.zip
[historyView] Rebase: Pass a better Ref as upstream
JGit change I1333a8dd170bb0077f491962013485efb6f2a926 is about improving the ours/theirs conflict markers during rebase. The way the rebase action worked before, it would always pass the commit ID to rebase, which is not very helpful during a rebase conflict. This change makes it use a Ref if there is one. If there are multiple refs pointing to the selected commit: - and if the branch being rebased tracks another one, this tracked branch should be the one to pick if it's in the list - otherwise pick a remote tracking branch if it's in the list Also adds a "does it work at all?" test for rebase in History view. Bug: 336819 Change-Id: Ib78c3e8965e2f57e2c844a065629511ab1158160 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 3342410d9a..8a2616c4be 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -281,6 +281,7 @@ CompareWithIndexAction_FileNotInIndex={0} not in index
RebaseCurrentRefCommand_RebaseCanceledMessage=The rebase operation was canceled
RebaseCurrentRefCommand_RebaseCanceledTitle=Rebase Canceled
RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing Branch {0}
+RebaseCurrentRefCommand_ErrorGettingCurrentBranchMessage=Error getting the branch to rebase
RebaseResultDialog_Aborted=Rebase was aborted
RebaseResultDialog_AbortRebaseRadioText=&Abort rebase
RebaseResultDialog_ActionGroupTitle=Action to perform

Back to the top