diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-18 16:04:51 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:11 -0700 |
| commit | ac584fcfd3e15b0a0200ee609bf964414936c710 (patch) | |
| tree | 5248a253050c1b65f1de2cd9851e00ca8a0dd1ca /include/git2/merge.h | |
| parent | 97f3462ae699fae370cfa410ed58eb869ae6b276 (diff) | |
| download | libgit2-ac584fcfd3e15b0a0200ee609bf964414936c710.tar.gz | |
Introduce GIT_MERGE_ANALYSIS_UNBORN
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 2cb8df36c..491f831f8 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -259,6 +259,13 @@ typedef enum { * given merge input. */ GIT_MERGE_ANALYSIS_FASTFORWARD = (1 << 2), + + /** + * The HEAD of the current repository is "unborn" and does not point to + * a valid commit. No merge can be performed, but the caller may wish + * to simply set HEAD to the target commit(s). + */ + GIT_MERGE_ANALYSIS_UNBORN = (1 << 3), } git_merge_analysis_t; /** |