delta/libgit2.git/src/merge.h, branch cmn/https-cap-no-hardcode

merge driver: remove `check` callback

2016-03-17T15:06:00+00:00

Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.

merge driver: correct global initialization

2016-03-17T15:06:00+00:00

merge driver: allow custom default driver

2016-03-17T15:02:27+00:00

Allow merge users to configure a custom default merge driver via
`git_merge_options`.  Similarly, honor the `merge.default` configuration
option.

merge driver: introduce custom merge drivers

2016-03-17T15:02:26+00:00

Consumers can now register custom merged drivers with
`git_merge_driver_register`.  This allows consumers to support the
merge drivers, as configured in `.gitattributes`.  Consumers will be
asked to perform the file-level merge when a custom driver is
configured.

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+00:00

merge: merge iterators

2015-05-11T18:11:56+00:00

PERF: In MERGE, lazily compute is_binary

2015-03-16T19:54:53+00:00

s/git_merge_head/git_annotated_commit

2014-10-27T02:59:48+00:00

Rename git_merge_head to git_annotated_commit, as it becomes used
in more operations than just merge.

git_checkout_index: checkout other indexes

2014-07-01T21:32:15+00:00

git_checkout_index can now check out other git_index's (that are not
necessarily the repository index).  This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out.  git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.

Introduce git_merge__extract_conflict_paths

2014-04-14T14:16:21+00:00