Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-02-12 05:18:43 -0500
committerMatthias Sohn2018-02-12 19:16:13 -0500
commitffa3b9913f7de7974e8aa6e5609ee1ab55c4c3fe (patch)
treeff5875fd9c7c1ea5e9a416c5327dc7dcbad97f72 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent56bfb4ea9d16b8b73b2d91a47cade016f7596c0b (diff)
downloadegit-ffa3b9913f7de7974e8aa6e5609ee1ab55c4c3fe.tar.gz
egit-ffa3b9913f7de7974e8aa6e5609ee1ab55c4c3fe.tar.xz
egit-ffa3b9913f7de7974e8aa6e5609ee1ab55c4c3fe.zip
Include local branch name in proposals
If "Push branch 'foo'" is run the default suggestion for the upstream name is the configured remote tracking branch (if any). The local branch name is suggested initially only if no remote tracking branch is set. A frequent use case for this dialog is to push a local branch to a *new* remote branch with the same name as the local branch. But since typically local branches are created off 'master' and do have 'origin/master' set as tracking branch, a user has in this case to type in the new upstream branch name. It wouldn't appear in the proposals list, which showed only existing upstream refs. Simplify this use case by including a ref for a new upstream branch in the list of proposals if there is no existing upstream branch with the same name as the local branch. Bug: 530685 Change-Id: I861d0ab73ed9476e664e5fe203da3a84829ce04f Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties5
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 29e2c0f57..9d37794af 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -56,6 +56,8 @@ AddRemoteWizard_Title=Add Remote
AddSubmoduleWizard_WindowTitle=Add Submodule
AddToIndexAction_addingFiles=Adding Files to Index
AddToIndexCommand_addingFilesFailed=Adding files failed
+AsynchronousRefProposalProvider_FetchingRemoteRefsMessage=Fetching remote refs from {0}
+AsynchronousRefProposalProvider_ShowingProposalsJobName=Showing proposals
RemoveFromIndexAction_removingFiles=Removing file from Index
BlameInformationControl_Author=Author: {0} <{1}> {2}
BlameInformationControl_Commit=Commit {0}
@@ -538,6 +540,7 @@ RefContentProposal_branch=branch
RefContentProposal_by=by
RefContentProposal_commit=commit
RefContentProposal_errorReadingObject=Unable to read object {0} for content proposal assistance (ref = {1})
+RefContentProposal_newRemoteObject=New object will be created at the remote repository
RefContentProposal_tag=tag
RefContentProposal_trackingBranch=tracking branch
RefContentProposal_tree=tree
@@ -961,7 +964,6 @@ FetchGerritChangePage_ContentAssistDescription=Patch set {0} of change {1}
FetchGerritChangePage_ContentAssistTooltip=Press {0} to see a filtered list of changes
FetchGerritChangePage_CreatingBranchTaskName=Creating branch
FetchGerritChangePage_CreatingTagTaskName=Creating tag
-FetchGerritChangePage_FetchingRemoteRefsMessage=Fetching remote refs from {0}
FetchGerritChangePage_FetchingTaskName=Fetching change {0}
FetchGerritChangePage_GeneratedTagMessage=Generated for Gerrit change {0}
FetchGerritChangePage_GetChangeTaskName=Get change from Gerrit
@@ -971,7 +973,6 @@ FetchGerritChangePage_MissingChangeMessage=Please provide a change
FetchGerritChangePage_NoSuchChangeMessage=The Gerrit server has no change number {0}
FetchGerritChangePage_PageMessage=Please select a Gerrit URI and change to fetch
FetchGerritChangePage_PageTitle=Fetch a change from Gerrit into repository {0}
-FetchGerritChangePage_ShowingProposalsJobName=Showing proposals
FetchGerritChangePage_SuggestedRefNamePattern=change/{0}/{1}
FetchGerritChangePage_TagNameText=Tag &name:
FetchGerritChangePage_TagRadio=Create and check out a &tag

Back to the top