diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 5158c8533b..a100c9d878 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -640,11 +640,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { List<RevCommit> cherryPickList = new ArrayList<RevCommit>(); for (RevCommit commit : commitsToUse) { if (commit.getParentCount() != 1) - throw new JGitInternalException( - MessageFormat.format( - JGitText.get().canOnlyCherryPickCommitsWithOneParent, - commit.name(), - Integer.valueOf(commit.getParentCount()))); + continue; cherryPickList.add(commit); } |