diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-05-18 11:39:33 -0500 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-05-18 11:40:21 -0500 |
| commit | 557ea857e3b5229379476f1ee4160fcf5b695bbd (patch) | |
| tree | bdfe51118576afbc4cc1cf2cd129e1d89f6b034b /org.eclipse.jgit.http.server/src | |
| parent | 7449b9a297af193107560c42508c53d7adb00226 (diff) | |
| download | jgit-557ea857e3b5229379476f1ee4160fcf5b695bbd.tar.gz jgit-557ea857e3b5229379476f1ee4160fcf5b695bbd.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.http.server/src')
0 files changed, 0 insertions, 0 deletions