]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18069ff) | patch
Interactive Rebase: Do actions if there were conflicts 18/18118/5
authorStefan Lay <stefan.lay@sap.com>
Wed, 6 Nov 2013 10:16:34 +0000 (11:16 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 8 Nov 2013 22:43:11 +0000 (23:43 +0100)
commit979e3467112618cc787e161097986212eaaa4533
treec2a3e489b488f170f7c7995d6a44db0b326886abtree | snapshot
parent18069ffe8cbede40cf2524922c262b67656e7021commit | diff
Interactive Rebase: Do actions if there were conflicts

If a commit was marked for edit, reword, squash or fixup, but the
interactive rebase stopped because of a conflict, the step was not done
after conflict resolution. This is done now.

Change-Id: If8e7ccc50469165744f2b8a53d180f9ba0f72330
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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