]> source.dussan.org Git - jgit.git/commit
Add Squash/Fixup support for rebase interactive in RebaseCommand 93/15293/11
authorTobias Pfeifer <to.pfeifer@web.de>
Wed, 7 Aug 2013 12:18:23 +0000 (14:18 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2013 17:05:02 +0000 (18:05 +0100)
commit765896febb4b63cfe2c37dc0a73c90c79dd1591b
treef6c13b3c779d5d64a99a294fd960fb460cf20a6c
parent01b5b999a567691fa9602792f365ba0dd5ae061f
Add Squash/Fixup support for rebase interactive in RebaseCommand

The rebase command now supports squash and fixup. Both actions are not
allowed as the first step of the rebase.

In JGit, before any rebase step is performed, the next commit is
already cherry-picked. This commit keeps that behaviour. In case of
squash or fixup a soft reset to the parent is perfomed afterwards.

CQ: 7684
Bug: 396510
Change-Id: I3c4190940b4d7f19860e223d647fc78705e57203
Signed-off-by: Tobias Pfeifer <to.pfeifer@web.de>
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
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/api/errors/InvalidRebaseStepException.java [new file with mode: 0644]
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/RebaseTodoLine.java