]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7449b9a) | patch
Implement rebase ff for upstream branches with merge commits 36/3336/8
authorChris Aniszczyk <caniszczyk@gmail.com>
Wed, 18 May 2011 16:39:33 +0000 (11:39 -0500)
committerChris Aniszczyk <caniszczyk@gmail.com>
Wed, 18 May 2011 16:40:21 +0000 (11:40 -0500)
commit557ea857e3b5229379476f1ee4160fcf5b695bbd
treebdfe51118576afbc4cc1cf2cd129e1d89f6b034btree | snapshot
parent7449b9a297af193107560c42508c53d7adb00226commit | diff
Implement rebase ff for upstream branches with merge commits

Change Ib9898fe0f982fa08e41f1dca9452c43de715fdb6 added support for
the 'cherry-pick' fast forward case where the upstream commit history
does not include any merge commits.  This change adds support for the
case where merge commits exist and the local branch has no changes.

Bug: 344779
Change-Id: If203ce5aa1b4e5d4d7982deb621b710e71f4ee10
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit