diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-03-08 14:10:02 -0700 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-03-08 14:10:02 -0700 |
| commit | 2461e0d20f46b6cfaf222759aca4a993ddc7b215 (patch) | |
| tree | 468d3501216a6075c6f686cb453dc60c5b338680 /src/reset.c | |
| parent | b5ab878f4c3ec6134c043a8c22d22290da1e3403 (diff) | |
| download | libgit2-2461e0d20f46b6cfaf222759aca4a993ddc7b215.tar.gz | |
Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARD
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reset.c b/src/reset.c index f42a0b3ae..351ecaa2a 100644 --- 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; |