diff options
| author | Stefan Lay <stefan.lay@sap.com> | 2010-05-20 15:09:39 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-05-24 09:52:28 -0500 |
| commit | 5b0e73b849d19c9f072c4c6738a5d5adae413112 (patch) | |
| tree | ce7fdcf571a78a173539cc06660b99ca4c16d0c8 /org.eclipse.jgit.iplog | |
| parent | 6ca9843f3ebbea152969a8b795efce1d4ff15dbf (diff) | |
| download | jgit-5b0e73b849d19c9f072c4c6738a5d5adae413112.tar.gz jgit-5b0e73b849d19c9f072c4c6738a5d5adae413112.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.iplog')
0 files changed, 0 insertions, 0 deletions