| commit | 5b0e73b849d19c9f072c4c6738a5d5adae413112 | |
| author | Stefan Lay <stefan.lay@sap.com> | |
| Thu, 20 May 2010 13:09:39 +0000 (20 15:09 +0200) | ||
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | |
| Mon, 24 May 2010 14:52:28 +0000 (24 09:52 -0500) | ||
| tree | ce7fdcf571a78a173539cc06660b99ca4c16d0c8 | treesnapshot (tar.gz zip) |
| parent | 6ca9843f3ebbea152969a8b795efce1d4ff15dbf | commitdiff |
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>
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>
| org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java | [new file with mode: 0644] | blob |
| org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | diffblobblamehistory | |
| org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java | diffblobblamehistory | |
| org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutConflictException.java | [new file with mode: 0644] | blob |
| org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java | diffblobblamehistory | |
| org.eclipse.jgit/src/org/eclipse/jgit/api/InvalidMergeHeadsException.java | [new file with mode: 0644] | blob |
| org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java | [new file with mode: 0644] | blob |
| org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java | [new file with mode: 0644] | blob |