Enhance merge support - #678

Open

tiennou wants to merge 13 commits into

libgit2:masterfrom

tiennou:fix/merge-support

Commits on Mar 24, 2019

Provide a wrapper for annotated commits
tiennou
committed
60f16d6
Provide a complete wrapper for the merge analysis function
tiennou
committed
b80f4ee
Fix typo
tiennou
committed
91c412f
Checkout the HEAD after creating test commits
tiennou
committed
ac5ef00
Don't go through an enumerator to grab a test commit's parent
tiennou
committed
c1a2c79
Defer this check to the merge analysis
tiennou
committed
902e1f7
Hoist normal-merge branch from if
tiennou
committed
a584aac
Obey the branch config w.r.t preferred merge types
tiennou
committed
7cce158
Rework how merges are made
tiennou
committed
aae1c39
Use the message left by the merge machinery as our commit message
tiennou
committed
7d4a1b1
Cleanup the repository now that we've done the commit
tiennou
committed
6435f82
Move the merge commit creation in a helper method
tiennou
committed
f09bddd
Add a method to complete merges from the current repository state
tiennou
committed
78783db