diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-08 15:41:36 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-05-27 20:49:16 -0500 |
| commit | d362093f9e858cf48d3c09bbcacf01f057b58db1 (patch) | |
| tree | 486b7c6bb8c4e6470c8b375c670c29abd279a98d /include/git2/merge.h | |
| parent | 433ba614a2ef948008510a1b1189702d515d2fc4 (diff) | |
| download | libgit2-d362093f9e858cf48d3c09bbcacf01f057b58db1.tar.gz | |
Introduce GIT_MERGE_CONFIG_* for merge.ff settings
git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD
when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when
merge.ff=true
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 7915050b0..dc63ed588 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -266,6 +266,18 @@ typedef enum { * to simply set HEAD to the target commit(s). */ GIT_MERGE_ANALYSIS_UNBORN = (1 << 3), + + /** + * 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), + + /** + * 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; /** |