]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9ffcf2a) | patch
Proper handling of rebase during pull 76/2376/1
authorMathias Kinzler <mathias.kinzler@sap.com>
Mon, 31 Jan 2011 11:12:48 +0000 (12:12 +0100)
committerMathias Kinzler <mathias.kinzler@sap.com>
Mon, 31 Jan 2011 11:12:48 +0000 (12:12 +0100)
commitb15b9d5df25b375108ca125b31338df637454865
tree21da9f5d1b1a077274ec6fcd601446e62e9c4dbctree | snapshot
parent9ffcf2a8b3cb49c445fabd011b26a36e622a033ccommit | diff
Proper handling of rebase during pull

After consulting with Christian Halstrick, it turned out that the
handling of rebase during pull was implemented incorrectly.

Change-Id: I40f03409e080cdfeceb21460150f5e02a016e7f4
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.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