Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2012-06-03 15:39:48 -0400
committerRobin Stocker2012-06-04 05:28:29 -0400
commite01d5bd9ca0c0fe8969a2ec883eadac3404f3d05 (patch)
treee8b27ee6e3f1052c009ac43c671df48705d07e3b /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parenta781598a482eff97cbb02c985a78e7841e79b7be (diff)
downloadegit-e01d5bd9ca0c0fe8969a2ec883eadac3404f3d05.tar.gz
egit-e01d5bd9ca0c0fe8969a2ec883eadac3404f3d05.tar.xz
egit-e01d5bd9ca0c0fe8969a2ec883eadac3404f3d05.zip
Allow amending a published commit
Provide a message type from CommitMessageComponent so calling classes know the severity of the message and report amending a published commit as a warning. A warning message is sufficient to notify the committer that they may be rewriting published history but it still should be allowed since there are valid cases for amending published commits and then force pushing. Change-Id: Ic2d4e279feb70c7f9ad45328cc369cdd981f3b96 Signed-off-by: Robin Stocker <robin@nibor.org>
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.properties2
1 files changed, 1 insertions, 1 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 71124a6c9..378753801 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
@@ -681,7 +681,7 @@ SpellCheckingMessageArea_paste=&Paste
SpellCheckingMessageArea_selectAll=Select &All
CommitMessageComponent_MessageInvalidAuthor=Invalid author specified. Example: A U Thor <author@example.com>
CommitMessageComponent_MessageInvalidCommitter=Invalid committer specified. Example: C O Mitter <committer@example.com>
-CommitMessageComponent_AmendingCommitInRemoteBranch=You are about to amend a commit that is already pushed. This is not recommended, as it changes published history.
+CommitMessageComponent_AmendingCommitInRemoteBranch=The commit being amended has already been published to a remote branch.
CommitMessageViewer_author=Author
CommitMessageViewer_child=Child
CommitMessageViewer_branches=Branches

Back to the top