diff options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index dc63ed588..d0092e45e 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -266,19 +266,26 @@ typedef enum { * to simply set HEAD to the target commit(s). */ GIT_MERGE_ANALYSIS_UNBORN = (1 << 3), +} git_merge_analysis_t; + +typedef enum { + /* + * No configuration was found that suggests a behavior for merge. + */ + GIT_MERGE_CONFIG_NONE = 0, /** * There is a `merge.ff=false` configuration setting, suggesting that * the user does not want to allow a fast-forward merge. */ - GIT_MERGE_CONFIG_NO_FASTFORWARD = (1 << 4), + GIT_MERGE_CONFIG_NO_FASTFORWARD = (1 << 0), /** * There is a `merge.ff=only` configuration setting, suggesting that * the user only wants fast-forward merges. */ - GIT_MERGE_CONFIG_FASTFORWARD_ONLY = (1 << 5), -} git_merge_analysis_t; + GIT_MERGE_CONFIG_FASTFORWARD_ONLY = (1 << 1), +} git_merge_config_t; /** * Analyzes the given branch(es) and determines the opportunities for @@ -292,6 +299,7 @@ typedef enum { */ GIT_EXTERN(int) git_merge_analysis( git_merge_analysis_t *analysis_out, + git_merge_config_t *config_out, git_repository *repo, const git_merge_head **their_heads, size_t their_heads_len); |