Skip to content
Snippets Groups Projects
Commit 5b0e73b8 authored by Stefan Lay's avatar Stefan Lay Committed by Chris Aniszczyk
Browse files

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: default avatarStefan Lay <stefan.lay@sap.com>
Signed-off-by: default avatarChristian Halstrick <christian.halstrick@sap.com>
Signed-off-by: default avatarChris Aniszczyk <caniszczyk@gmail.com>
parent 6ca9843f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 745 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment