]> source.dussan.org Git - jgit.git/commit
Make PullCommand work with Rebase 65/2365/4
authorMathias Kinzler <mathias.kinzler@sap.com>
Fri, 28 Jan 2011 13:40:09 +0000 (14:40 +0100)
committerMathias Kinzler <mathias.kinzler@sap.com>
Fri, 28 Jan 2011 14:04:52 +0000 (15:04 +0100)
commit14ca80bc90ed85e3484fa28aa665fa0538096d30
treeb714d4fac57dab28d6e7554d4b766f1a07407b46
parente8a1328d05aa55b7ace0d101e34b87422219c959
Make PullCommand work with Rebase

Rebase must honor the upstream configuration

branch.<branchname>.rebase

Change-Id: Ic94f263d3f47b630ad75bd5412cb4741bb1109ca
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/api/PullResult.java