libgit2

git_merge_options

Version:

Signature

GitHub
typedef struct git_merge_options { unsigned int version git_merge_tree_flag_t flags unsigned int rename_threshold unsigned int target_limit git_diff_similarity_metric *metric git_merge_file_favor_t file_favor };

Members

unsigned int
version
git_merge_tree_flag_t
flags
unsigned int
rename_threshold

Similarity to consider a file renamed (default 50). If GIT_MERGE_TREE_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

git_merge_file_favor_t
file_favor

Flags for handling conflicting content.

Parameter To

Versions