Stefan Lay
5b0e73b849
Add a merge command to the jgit API
Merges the current head with one other commit. In this first iteration the merge command supports only fast forward and already up-to-date. Change-Id: I0db480f061e01b343570cf7da02cac13a0cbdf8f Signed-off-by: Stefan Lay <stefan.lay@sap.com> Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com> |
14 年之前 | |
---|---|---|
.. | ||
CommitAndLogCommandTests.java | Added merge support to CommitCommand | 14 年之前 |
MergeCommandTest.java | Add a merge command to the jgit API | 14 年之前 |