Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Stocker2013-09-01 14:54:14 -0400
committerMatthias Sohn2013-09-18 15:46:05 -0400
commit47cb869505e1134e196b843a68ebb6f4a19cefa0 (patch)
tree170d81ddd19cd375a5ea8d9738b4bda2eb558109 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent6e0d292c2840c19eaa4110f960eda689fe170414 (diff)
downloadegit-47cb869505e1134e196b843a68ebb6f4a19cefa0.tar.gz
egit-47cb869505e1134e196b843a68ebb6f4a19cefa0.tar.xz
egit-47cb869505e1134e196b843a68ebb6f4a19cefa0.zip
Offer to create branch when checking out remote-tracking branch
A common mistake for new users of EGit is that they want to work on a branch existing on a remote and therefore check out the remote-tracking branch. Instead the right thing to do would have been to create a new local branch based on it. This change shows a question whether to create a new local branch or whether to check out the commit behind the remote-tracking branch. To make it clear that there will be a question, the label is "Checkout..." instead of "Checkout" when a remote-tracking branch is selected. For advanced users already knowing about this, the question dialog is not shown when the warning about "detached HEAD" is disabled. Bug: 341679 Change-Id: I8701aee4bb12de0848f4820a3f7725435cbf106d Signed-off-by: Robin Stocker <robin@nibor.org>
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.properties11
1 files changed, 9 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 745e8b432..7f83e6204 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
@@ -234,9 +234,12 @@ CleanRepositoryPage_includeIgnored=Include ignored resources
CleanRepositoryPage_message=Select items to clean
CleanRepositoryPage_title=Clean Repository
ClearCredentialsCommand_clearingCredentialsFailed=Clearing credentials failed.
+CheckoutCommand_CheckoutLabel=&Checkout
+CheckoutCommand_CheckoutLabelWithQuestion=&Checkout...
CheckoutConflictDialog_conflictMessage=The files shown below have uncommitted changes which would be lost by the selected operation.\n\nEither commit the changes to the repository or discard the changes by resetting the current branch.
CheckoutDialog_Message=Select a ref and choose action to execute
CheckoutDialog_OkCheckout=&Checkout
+CheckoutDialog_OkCheckoutWithQuestion=&Checkout...
CheckoutDialog_Title=Checkout a ref or work with branches
CheckoutDialog_WindowTitle=Branches
CheckoutHandler_SelectBranchMessage=There is more than one branch for this commit. Please select the branch you want to check out.
@@ -912,6 +915,10 @@ BranchConfigurationDialog_RebaseLabel=&Rebase
BranchConfigurationDialog_RemoteLabel=Rem&ote:
BranchConfigurationDialog_SaveBranchConfigFailed=Could not save branch configuration
BranchConfigurationDialog_UpstreamBranchLabel=Upstream &Branch:
+BranchOperationUI_CheckoutRemoteTrackingAsLocal=Checkout as New Local Branch
+BranchOperationUI_CheckoutRemoteTrackingCommit=Checkout Commit
+BranchOperationUI_CheckoutRemoteTrackingQuestion=If you want to work on the branch, a new local branch has to be created and checked out.\n\nIf you just want to have a look at the state of the branch, the commit of the remote-tracking branch can be checked out.
+BranchOperationUI_CheckoutRemoteTrackingTitle=Check out remote-tracking branch
BranchOperationUI_DetachedHeadTitle=Detached HEAD
BranchOperationUI_DetachedHeadMessage=You are in the 'detached HEAD' state. This means that you don't have a local branch checked out.\n\nYou can look around, but it's not recommended to commit changes. The reason is that these commits would not be on any branch and would not be visible after checking out another branch.\n\nIf you want to make changes, create or checkout a local branch first.
BranchRenameDialog_Message=Please enter a new name for branch {0}
@@ -930,7 +937,7 @@ BranchResultDialog_buttonReset=Reset
BranchResultDialog_buttonStash=Stash...
BranchResultDialog_CheckoutConflictsMessage=The files shown below have uncommitted changes which would be lost by checking out ''{0}''.\n\nEither commit the changes, stash the changes, or discard the changes by resetting the current branch.
BranchResultDialog_CheckoutConflictsTitle=Checkout Conflicts
-BranchResultDialog_dontShowAgain=Don't show this confirmation dialog again
+BranchResultDialog_DetachedHeadWarningDontShowAgain=Don't show any dialogs about this again
CheckoutDialog_ErrorCouldNotCreateNewRef=Could not create new ref {0}
CheckoutDialog_ErrorCouldNotDeleteRef=Could not delete ref {0}
CheckoutDialog_ErrorCouldNotRenameRef=Failed to rename branch {0} -> {1}, status={2}
@@ -1062,7 +1069,7 @@ RepositoriesViewLabelProvider_SubmodulesNodeText=Submodules
RepositoriesViewLabelProvider_SymbolicRefNodeText=References
RepositoriesViewLabelProvider_TagsNodeText=Tags
-DialogsPreferencePage_DetachedHeadCombo=D&etached HEAD warning
+DialogsPreferencePage_DetachedHeadCombo=D&etached HEAD and checkout of remote-tracking branch
DialogsPreferencePage_HideConfirmationGroupHeader=Show confirmation dialogs
DialogsPreferencePage_HideWarningGroupHeader=Log warnings
DialogsPreferencePage_HomeDirWarning=&Home directory warning (Windows only)

Back to the top