delta/libgit2.git/include/git2/merge.h, branch cmn/server-errors

Update documentation for API changes

2015-04-30T14:59:50+00:00

Added options to enable patience and minimal diff drivers

2015-03-16T07:53:27+00:00

Collapse whitespace flags into git_merge_file_flags_t

2015-03-16T07:53:27+00:00

Renamed git_merge_options 'flags' to 'tree_flags'

2015-03-16T07:53:27+00:00

Allow for merges with whitespace discrepancies

2015-03-16T07:53:27+00:00

Better document `git_merge_commits`

2015-01-05T17:35:18+00:00

`git_merge_commits` (and thus `git_merge`) do not use the same
strategy as `git-merge-recursive` wherein they can produce an
artificial common ancestor that is the merge of all common
ancestors.  Document this accordingly.

doc: add documentation to all the public structs and enums

2014-12-06T02:44:40+00:00

This makes them show up in the reference, even if the text itself isn't
the most descriptive.

These have been found with

    grep -Przon '\n\ntypedef struct.*?\{' -- include
    grep -Przon '\n\ntypedef enum.*?\{' -- include

merge: talk about the merging state after git_merge()

2014-11-02T16:18:19+00:00

Since it's not necessarily obvious, mention the merging state and how to
clear it.

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.

Add git_merge_bases_many.

2014-10-09T12:19:00+00:00