summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/git2/merge.h')
-rw-r--r--include/git2/merge.h7
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;
/**