Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaik Schreiber2014-03-25 08:09:14 -0400
committerMatthias Sohn2014-04-04 11:39:37 -0400
commitd6b7699ef7d5c7d31324b6e92dee55fcb96f81b0 (patch)
tree63e47906f68bca9b44471dc0b2279a39da006df9 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parentd89162b594f98a2846184b589681d1c9b9f92d63 (diff)
downloadegit-d6b7699ef7d5c7d31324b6e92dee55fcb96f81b0.tar.gz
egit-d6b7699ef7d5c7d31324b6e92dee55fcb96f81b0.tar.xz
egit-d6b7699ef7d5c7d31324b6e92dee55fcb96f81b0.zip
Add ability to edit a commit directly from the history view.
This adds a new menu item Modify > Edit to the context menu of the history view. It can be used to edit a commit, then manually amending the commit afterwards. An error will be displayed if the selected commit cannot be reached from the current HEAD commit. This is done so as to avoid the need to checkout another commit automatically before executing the edit procedure. CQ: 8158 Bug: 431751 Change-Id: Idef404f2d712cccb862a7eb11571a7a4151badb8 Signed-off-by: Maik Schreiber <blizzy@blizzy.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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.properties8
1 files changed, 8 insertions, 0 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 3f57b516e..338b50add 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
@@ -204,6 +204,7 @@ GitHistoryPage_mergeMenuItem=Merge
GitHistoryPage_rebaseMenuItem=Rebase on
GitHistoryPage_rebaseInteractiveMenuItem=Rebase Interactive
GitHistoryPage_rewordMenuItem=Reword
+GitHistoryPage_editMenuItem=Edit
GitHistoryPage_SetAsBaselineMenuLabel=&Set as Baseline
GitHistoryPage_ShowAdditionalRefsMenuLabel=&Additional Refs
GitHistoryPage_ShowAllBranchesMenuLabel=All &Branches and Tags
@@ -1780,6 +1781,13 @@ RewordHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is
RewordHandler_InternalError=An internal error occurred
RewordHandler_JobName=Rewording Commit {0}
+EditHandler_CommitNotOnCurrentBranch=The selected commit cannot be edited because it is not on the currently checked-out branch.
+EditHandler_Error_Title=Error Editing Commit
+EditHandler_ErrorCheckingIfCommitIsOnCurrentBranch=Error checking if commit is on current branch
+EditHandler_InternalError=An internal error occurred
+EditHandler_JobName=Editing Commit {0}
+EditHandler_OpenStagingAndRebaseInteractiveViews=Open Staging and Interactive Rebase Views
+
GitModelSynchronizeParticipant_initialScopeName=Git
GitModelSynchronizeParticipant_noCachedSourceVariant=Could not locate cached source variant for resource: {0}

Back to the top