libgit2

merge

Version:
Git merge routines

Objects

Merge heads, the input to merge

Merge result

Structs

Macros

Enums

Flags for git_merge_tree options passed in via the flags value in the git_merge_tree_opts.

Automerge options for git_merge_trees_opts

Functions

Find a merge base between two commits

Find a merge base given a list of commits

Creates a git_merge_head from the given reference

Creates a git_merge_head from the given fetch head data

Creates a git_merge_head from the given commit id

Merge two trees, producing a git_index that reflects the result of the merge

Merges the given commits into HEAD, producing a new commit

Returns true if a merge is up-to-date (we were asked to merge the target into itself

Returns true if a merge is eligible for fastforward

Gets the fast-forward OID if the merge was a fastforward