]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 08d5ede) | patch
Do not cherry-pick merge commits during rebase 48/10548/5
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Wed, 20 Feb 2013 23:07:33 +0000 (00:07 +0100)
committerRobin Stocker <robin@nibor.org>
Fri, 8 Mar 2013 15:40:19 +0000 (16:40 +0100)
commit3ad454497cdb6a917c00b01c735f5a469b8fb2ff
treea5caca7d4f790f4e76c4e8a775f281a0270e1c3dtree | snapshot
parent08d5ede281843701ba709ef4f6f4336958f215d5commit | diff
Do not cherry-pick merge commits during rebase

Rebase computes the list of commits that are included in
the merges, just like Git does, so do not try to include
the merge commits. Re-recreating merges during rebase is
a bit more complicated and might be a useful future extension,
but for now just linearize during rebase.

Change-Id: I61239d265f395e5ead580df2528e46393dc6bdbd
Signed-off-by: Robin Stocker <robin@nibor.org>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit