Top | Description | Object Hierarchy | ![]() |
![]() |
![]() |
![]() |
enum GgitMergeAutomergeMode; enum GgitMergeTreeFlags; GgitMergeTreeOptions; GgitMergeTreeOptions * ggit_merge_tree_options_copy (GgitMergeTreeOptions *merge_options
); void ggit_merge_tree_options_free (GgitMergeTreeOptions *merge_options
); GgitMergeTreeOptions * ggit_merge_tree_options_new (GgitMergeTreeFlags flags
,guint rename_threshold
,guint target_limit
,GgitDiffSimilarityMetric *metric
,GgitMergeAutomergeMode automerge_mode
);
GEnum +----GgitMergeAutomergeMode
GFlags +----GgitMergeTreeFlags
GBoxed +----GgitMergeTreeOptions
typedef enum { GGIT_MERGE_AUTOMERGE_MODE_NORMAL = 0, GGIT_MERGE_AUTOMERGE_MODE_NONE = 1, GGIT_MERGE_AUTOMERGE_MODE_FAVOR_OURS = 2, GGIT_MERGE_AUTOMERGE_MODE_FAVOR_THEIRS = 3 } GgitMergeAutomergeMode;
typedef enum { GGIT_MERGE_TREE_FIND_RENAMES = (1 << 0) } GgitMergeTreeFlags;
typedef struct _GgitMergeTreeOptions GgitMergeTreeOptions;
Represents the options used when merging.
GgitMergeTreeOptions * ggit_merge_tree_options_copy (GgitMergeTreeOptions *merge_options
);
Copies merge_options
into a newly allocated GgitMergeTreeOptions.
|
a GgitMergeTreeOptions. |
Returns : |
a newly allocated GgitMergeTreeOptions. [transfer full] |
void ggit_merge_tree_options_free (GgitMergeTreeOptions *merge_options
);
Frees merge_options
.
|
a GgitMergeTreeOptions. |
GgitMergeTreeOptions * ggit_merge_tree_options_new (GgitMergeTreeFlags flags
,guint rename_threshold
,guint target_limit
,GgitDiffSimilarityMetric *metric
,GgitMergeAutomergeMode automerge_mode
);
Creates a new GgitMergeTreeOptions.
|
flags to consider when merging. |
|
similarity to consider a file renamed (default 50). |
|
maximum similarity sources to examine (overrides the `merge_tree.renameLimit` config) (default 200). |
|
a GgitDiffSimilarityMetric or NULL to use internal metric. [allow-none]
|
|
mode for automerging. |
Returns : |
a newly allocated GgitMergeTreeOptions. |