2656ac1b5acb9b73c6b47e2cf8830a0a0b2cc214 - jgit

commit	2656ac1b5acb9b73c6b47e2cf8830a0a0b2cc214	[log] [tgz]
author	Tomasz Zarna <Tomasz.Zarna@pl.ibm.com>	Wed Jun 13 23:28:55 2012 +0200
committer	Matthias Sohn <matthias.sohn@sap.com>	Fri Jun 15 08:59:41 2012 +0200
tree	1f48ca5fafef4ae7482c88b2084d532508bb944c
parent	c4087af65ddfd976f2a2513a773f50b1fd790336 [diff]

Add "--squash" option to MergeCommand

CQ: 6570
Bug: 351806
Change-Id: I5e47810376419264ecf4247b5a333af5c8945080
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java[diff]
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java[diff]
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java[diff]
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/MergeHeadMsgTest.java[diff]
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/SquashCommitMsgTest.java[Added - diff]
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SquashMessageFormatterTest.java[Added - diff]
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties[diff]
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java[diff]
org.eclipse.jgit/src/org/eclipse/jgit/merge/SquashMessageFormatter.java[Added - diff]
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalkUtils.java[diff]

17 files changed