libgit2

git_merge_options

Version:

Merging options

Signature

GitHub
typedef struct git_merge_options { unsigned int version uint32_t flags unsigned int rename_threshold unsigned int target_limit git_diff_similarity_metric *metric unsigned int recursion_limit const char *default_driver git_merge_file_favor_t file_favor uint32_t file_flags };

Members

unsigned int
version
uint32_t
flags

See git_merge_flag_t above

unsigned int
rename_threshold

Similarity to consider a file renamed (default 50). If GIT_MERGE_FIND_RENAMES is enabled, added files will be compared with deleted files to determine their similarity. Files that are more similar than the rename threshold (percentage-wise) will be treated as a rename.

unsigned int
target_limit

Maximum similarity sources to examine for renames (default 200). If the number of rename candidates (add / delete pairs) is greater than this value, inexact rename detection is aborted.

This setting overrides the merge.renameLimit configuration value.

git_diff_similarity_metric *
metric

Pluggable similarity metric; pass NULL to use internal metric

unsigned int
recursion_limit

Maximum number of times to merge common ancestors to build a virtual merge base when faced with criss-cross merges. When this limit is reached, the next ancestor will simply be used instead of attempting to merge it. The default is unlimited.

const char *
default_driver

Default merge driver to be used when both sides of a merge have changed. The default is the text driver.

git_merge_file_favor_t
file_favor

Flags for handling conflicting content, to be used with the standard (text) merge driver.

uint32_t
file_flags

see git_merge_file_flag_t above

Parameter To

Versions