diff options
| author | Mathias Kinzler | 2010-11-22 15:26:00 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2010-11-22 15:58:36 +0000 |
| commit | e5b96a7848d680cf50123a44cbc147db91d798d3 (patch) | |
| tree | 6ce0488c869ebcb9248f3f1cdb90544b88d3645c /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | |
| parent | bd98a0a9a52973704467cda892e99711524de48b (diff) | |
| download | jgit-e5b96a7848d680cf50123a44cbc147db91d798d3.tar.gz jgit-e5b96a7848d680cf50123a44cbc147db91d798d3.tar.xz jgit-e5b96a7848d680cf50123a44cbc147db91d798d3.zip | |
Initial implementation of a Rebase command
This is a first iteration to implement Rebase. At the moment, this
does not implement --continue and --skip, so if the first
conflict is found, the only option is to --abort the command.
Bug: 328217
Change-Id: I24d60c0214e71e5572955f8261e10a42e9e95298
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java index 2eb316e85c..9c4717a814 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java @@ -68,12 +68,14 @@ public class JGitText extends TranslationBundle { /***/ public String URLNotFound; /***/ public String aNewObjectIdIsRequired; /***/ public String abbreviationLengthMustBeNonNegative; + /***/ public String abortingRebase; /***/ public String advertisementCameBefore; /***/ public String advertisementOfCameBefore; /***/ public String amazonS3ActionFailed; /***/ public String amazonS3ActionFailedGivingUp; /***/ public String ambiguousObjectAbbreviation; /***/ public String anExceptionOccurredWhileTryingToAddTheIdOfHEAD; + /***/ public String applyingCommit; /***/ public String anSSHSessionHasBeenAlreadyCreated; /***/ public String atLeastOnePathIsRequired; /***/ public String atLeastOnePatternIsRequired; @@ -318,6 +320,7 @@ public class JGitText extends TranslationBundle { /***/ public String missingForwardImageInGITBinaryPatch; /***/ public String missingObject; /***/ public String missingPrerequisiteCommits; + /***/ public String missingRequiredParameter; /***/ public String missingSecretkey; /***/ public String mixedStagesNotAllowed; /***/ public String multipleMergeBasesFor; @@ -352,6 +355,7 @@ public class JGitText extends TranslationBundle { /***/ public String objectIsCorrupt; /***/ public String objectIsNotA; /***/ public String objectNotFoundIn; + /***/ public String obtainingCommitsForCherryPick; /***/ public String offsetWrittenDeltaBaseForObjectNotFoundInAPack; /***/ public String onlyAlreadyUpToDateAndFastForwardMergesAreAvailable; /***/ public String onlyOneFetchSupported; @@ -418,8 +422,10 @@ public class JGitText extends TranslationBundle { /***/ public String repositoryState_rebaseOrApplyMailbox; /***/ public String repositoryState_rebaseWithMerge; /***/ public String requiredHashFunctionNotAvailable; + /***/ public String resettingHead; /***/ public String resolvingDeltas; /***/ public String resultLengthIncorrect; + /***/ public String rewinding; /***/ public String searchForReuse; /***/ public String sequenceTooLargeForDiffAlgorithm; /***/ public String serviceNotPermitted; @@ -496,4 +502,5 @@ public class JGitText extends TranslationBundle { /***/ public String writingNotSupported; /***/ public String writingObjects; /***/ public String wrongDecompressedLength; + /***/ public String wrongRepositoryState; } |