Code

Enhance merge support#678

Code

Open

tiennou wants to merge 13 commits intolibgit2:masterlibgit2/objective-git:masterfrom

tiennou:fix/merge-supporttiennou/objective-git:fix/merge-supportCopy head branch name to clipboard

Commits

Commits on Mar 24, 2019

• Provide a wrapper for annotated commits

  tiennou

  committed
  60f16d6

  Copy full SHA for 60f16d6

• Provide a complete wrapper for the merge analysis function

  tiennou

  committed
  b80f4ee

  Copy full SHA for b80f4ee

• Fix typo

  tiennou

  committed
  91c412f

  Copy full SHA for 91c412f

• Checkout the HEAD after creating test commits

  Show description for ac5ef00
  tiennou

  committed
  ac5ef00

  Copy full SHA for ac5ef00

• Don't go through an enumerator to grab a test commit's parent

  tiennou

  committed
  c1a2c79

  Copy full SHA for c1a2c79

• Defer this check to the merge analysis

  tiennou

  committed
  902e1f7

  Copy full SHA for 902e1f7

• Hoist normal-merge branch from if

  Show description for a584aac
  tiennou

  committed
  a584aac

  Copy full SHA for a584aac

• Obey the branch config w.r.t preferred merge types

  tiennou

  committed
  7cce158

  Copy full SHA for 7cce158

• Rework how merges are made

  Show description for aae1c39
  tiennou

  committed
  aae1c39

  Copy full SHA for aae1c39

• Use the message left by the merge machinery as our commit message

  tiennou

  committed
  7d4a1b1

  Copy full SHA for 7d4a1b1

• Cleanup the repository now that we've done the commit

  tiennou

  committed
  6435f82

  Copy full SHA for 6435f82

• Move the merge commit creation in a helper method

  tiennou

  committed
  f09bddd

  Copy full SHA for f09bddd

• Add a method to complete merges from the current repository state

  tiennou

  committed
  78783db

  Copy full SHA for 78783db