Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD

2461e0d2 · Pierre-Olivier Latour · b5ab878f · 2461e0d2
Commit 2461e0d2 authored Mar 08, 2015 by Pierre-Olivier Latour
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/reset.c
+1 -1

No files found.
--- a/src/reset.c
+++ b/src/reset.c
@@ -149,7 +149,7 @@ int git_reset(

 	if (reset_type == GIT_RESET_HARD) {
 		/* overwrite working directory with HEAD */
-		opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_SKIP_UNMERGED;
+		opts.checkout_strategy = GIT_CHECKOUT_FORCE;

 		if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0)
 			goto cleanup;