diff options
| author | Christian Halstrick | 2010-10-08 13:39:04 +0000 |
|---|---|---|
| committer | Christian Halstrick | 2010-10-15 14:38:34 +0000 |
| commit | 9b4876cedf430e454b99da5410e2a9d624f35129 (patch) | |
| tree | 4e2e5b4d42c83019c35a40942daa9b1bb07f8c9f /org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | |
| parent | 4c7e100910cb1b40fc3aed0a21abe0806645c02a (diff) | |
| download | jgit-9b4876cedf430e454b99da5410e2a9d624f35129.tar.gz jgit-9b4876cedf430e454b99da5410e2a9d624f35129.tar.xz jgit-9b4876cedf430e454b99da5410e2a9d624f35129.zip | |
Add Cherry-Pick command
Implemented the initial version of a cherry-pick command.
A correct error handling is missing (what happens if the
checkout fails, the cherry-pick leads to conflicts etc).
But straightforward cherry-picks works.
Change-Id: I235c0eb3a7a2d5bdfe40400f1deed06f29d746e1
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.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 | 2 |
1 files changed, 2 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 93b9700395..d6c6018006 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java @@ -130,6 +130,7 @@ public class JGitText extends TranslationBundle { /***/ public String cannotStoreObjects; /***/ public String cannotUnloadAModifiedTree; /***/ public String cannotWorkWithOtherStagesThanZeroRightNow; + /***/ public String canOnlyCherryPickCommitsWithOneParent; /***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset; /***/ public String cantPassMeATree; /***/ public String channelMustBeInRange0_255; @@ -216,6 +217,7 @@ public class JGitText extends TranslationBundle { /***/ public String errorOccurredDuringUnpackingOnTheRemoteEnd; /***/ public String errorReadingInfoRefs; /***/ public String exceptionCaughtDuringExecutionOfAddCommand; + /***/ public String exceptionCaughtDuringExecutionOfCherryPickCommand; /***/ public String exceptionCaughtDuringExecutionOfCommitCommand; /***/ public String exceptionCaughtDuringExecutionOfFetchCommand; /***/ public String exceptionCaughtDuringExecutionOfMergeCommand; |