diff options
author | Mathias Kinzler <mathias.kinzler@sap.com> | 2010-11-22 16:26:00 +0100 |
---|---|---|
committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-11-22 09:58:36 -0600 |
commit | e5b96a7848d680cf50123a44cbc147db91d798d3 (patch) | |
tree | 6ce0488c869ebcb9248f3f1cdb90544b88d3645c /org.eclipse.jgit/resources/org | |
parent | bd98a0a9a52973704467cda892e99711524de48b (diff) | |
download | jgit-e5b96a7848d680cf50123a44cbc147db91d798d3.tar.gz 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/resources/org')
-rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index ab4ec61325..e05500e0a5 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -8,6 +8,7 @@ URINotSupported=URI not supported: {0} URLNotFound={0} not found aNewObjectIdIsRequired=A NewObjectId is required. abbreviationLengthMustBeNonNegative=Abbreviation length must not be negative. +abortingRebase=Aborting rebase: resetting to {0} advertisementCameBefore=advertisement of {0}^{} came before {1} advertisementOfCameBefore=advertisement of {0}^{} came before {1} amazonS3ActionFailed={0} of '{1}' failed: {2} {3} @@ -15,6 +16,7 @@ amazonS3ActionFailedGivingUp={0} of '{1}' failed: Giving up after {2} attempts. ambiguousObjectAbbreviation=Object abbreviation {0} is ambiguous anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created +applyingCommit=Applying {0} atLeastOnePathIsRequired=At least one path is required. atLeastOnePatternIsRequired=At least one pattern is required. atLeastTwoFiltersNeeded=At least two filters needed. @@ -258,6 +260,7 @@ missingDeltaBase=delta base missingForwardImageInGITBinaryPatch=Missing forward-image in GIT binary patch missingObject=Missing {0} {1} missingPrerequisiteCommits=missing prerequisite commits: +missingRequiredParameter=Parameter "{0}" is missing missingSecretkey=Missing secretkey. mixedStagesNotAllowed=Mixed stages not allowed multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3} @@ -292,6 +295,7 @@ objectAtPathDoesNotHaveId=Object at path "{0}" does not have an id assigned. All objectIsCorrupt=Object {0} is corrupt: {1} objectIsNotA=Object {0} is not a {1}. objectNotFoundIn=Object {0} not found in {1}. +obtainingCommitsForCherryPick=Obtaining commits that need to be cherry-picked offsetWrittenDeltaBaseForObjectNotFoundInAPack=Offset-written delta base for object not found in a pack onlyAlreadyUpToDateAndFastForwardMergesAreAvailable=only already-up-to-date and fast forward merges are available onlyOneFetchSupported=Only one fetch supported @@ -359,7 +363,9 @@ repositoryState_rebaseOrApplyMailbox=Rebase/Apply mailbox repositoryState_rebaseWithMerge=Rebase w/merge requiredHashFunctionNotAvailable=Required hash function {0} not available. resolvingDeltas=Resolving deltas +resettingHead=Resetting head to {0} resultLengthIncorrect=result length incorrect +rewinding=Rewinding to commit {0} searchForReuse=Finding sources sequenceTooLargeForDiffAlgorithm=Sequence too large for difference algorithm. serviceNotPermitted={0} not permitted @@ -436,3 +442,4 @@ writingNotPermitted=Writing not permitted writingNotSupported=Writing {0} not supported. writingObjects=Writing objects wrongDecompressedLength=wrong decompressed length +wrongRepositoryState=Wrong Repository State: {0} |