diff options
| author | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-16 18:42:44 +0200 |
|---|---|---|
| committer | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-05-17 19:18:07 +0200 |
| commit | b84057ad629f4dfc0a94b6a273570a53ba5a9d0a (patch) | |
| tree | 9159244012ff1e727c676ca1b29ab694d700825e /org.eclipse.jgit/resources | |
| parent | 2aa2b3af31e95b90c20794c727fc2e48b5f448e9 (diff) | |
| download | jgit-b84057ad629f4dfc0a94b6a273570a53ba5a9d0a.tar.gz jgit-b84057ad629f4dfc0a94b6a273570a53ba5a9d0a.zip | |
Cherry-Pick: Support --mainline to pick merges
By specifying a mainline parent, a merge is cherry picked as if this
parent was its only parent. If no mainline parent is given, cherry
picking merges is not allowed, as before.
Change-Id: I391cb73bf8f49e2df61428c17b40fae8c86a8b76
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index b3049b07f4..7b073217a5 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -85,6 +85,7 @@ cannotUnloadAModifiedTree=Cannot unload a modified tree. cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index. canOnlyCherryPickCommitsWithOneParent=Cannot cherry-pick commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported. canOnlyRevertCommitsWithOneParent=Cannot revert commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported +commitDoesNotHaveGivenParent=The commit ''{0}'' does not have a parent number {1}. cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can't find object in (reverse) pack index for the specified offset {0} cantPassMeATree=Can't pass me a tree! channelMustBeInRange0_255=channel {0} must be in range [0, 255] |