diff options
| author | Jens Baumgart | 2012-04-02 23:19:16 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2012-04-02 23:19:16 +0000 |
| commit | 5864314f020aa2767828ced20d5b1ee2746d261c (patch) | |
| tree | a3212778d13c6f48fb999c18a760d0ce57e4e0f6 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | |
| parent | ccacf66e3549be01bad22da967f60c32c9385576 (diff) | |
| download | egit-5864314f020aa2767828ced20d5b1ee2746d261c.tar.gz egit-5864314f020aa2767828ced20d5b1ee2746d261c.tar.xz egit-5864314f020aa2767828ced20d5b1ee2746d261c.zip | |
Staging View: allow discarding changes on non-workspace files
It is now possible to discard a change on a non-workspace file in the
"Unstaged Changes" table. The "Replace with File in Git Index" action is
now available on the following files:
1. Deleted/modified files in closed projects
2. Deleted/modified non-workspace files
Bug: 351341
Change-Id: Id6af4f71dbda5d080d96a387365831688a4984a8
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
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.properties | 2 |
1 files changed, 2 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 6e96c198e9..5aa8e0024a 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 @@ -1476,6 +1476,7 @@ StagingView_Ammend_Previous_Commit=Amend Previous Commit StagingView_Add_Signed_Off_By=Add Signed-off-by StagingView_Add_Change_ID=Add Change-Id StagingView_Commit=Commit +StagingView_checkoutFailed=Checking out files failed StagingView_commitFailed=Commit failed StagingView_committingNotPossible=Committing is not possible StagingView_headCommitChanged=\# WARNING: head commit changed in the meantime @@ -1487,6 +1488,7 @@ StagingView_Refresh=Refresh StagingView_LinkSelection=Link with Editor and Selection StagingView_exceptionTitle=Refresh Error StagingView_exceptionMessage=Errors occurred while applying processing change notifications. +StagingView_replaceWithFileInGitIndex=Replace with File in Git Index StagingView_UnstageItemMenuLabel=Remove from Git Index StagingView_StageItemMenuLabel=Add to Git Index StagingViewContentProvider_SubmoduleError=Unhandled exception while analyzing submodules |