thodg/libgit2

diff --git a/src/cherrypick.c b/src/cherrypick.c
index ebc9fcd..c929751 100644
--- a/src/cherrypick.c
+++ b/src/cherrypick.c
@@ -72,7 +72,7 @@ static int cherrypick_normalize_opts(
 	const char *their_label)
 {
 	int error = 0;
-	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE |
+	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
 		GIT_CHECKOUT_ALLOW_CONFLICTS;
 
 	GIT_UNUSED(repo);
diff --git a/src/revert.c b/src/revert.c
index f8a7f43..c481e7d 100644
--- a/src/revert.c
+++ b/src/revert.c
@@ -73,7 +73,7 @@ static int revert_normalize_opts(
 	const char *their_label)
 {
 	int error = 0;
-	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE |
+	unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE |
 		GIT_CHECKOUT_ALLOW_CONFLICTS;
 
 	GIT_UNUSED(repo);