diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-07-17 18:49:56 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-10-17 00:20:06 +0400 |
| commit | 629b661caab321a3aa5ffd7274ea4ed441d2805e (patch) | |
| tree | 52e5236b88ec970a513caf1a35844e230ccfa91e /src/reset.c | |
| parent | 3acf44d6cb5e56fea379504c07ae7ac8dd0e586d (diff) | |
checkout (from index) can write conflicts
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 cea212a93..87dc45a3f 100644 --- a/src/reset.c +++ b/src/reset.c @@ -135,7 +135,7 @@ int git_reset( if (reset_type == GIT_RESET_HARD) { /* overwrite working directory with HEAD */ - opts.checkout_strategy = GIT_CHECKOUT_FORCE; + opts.checkout_strategy = GIT_CHECKOUT_FORCE | GIT_CHECKOUT_SKIP_UNMERGED; if ((error = git_checkout_tree(repo, (git_object *)tree, &opts)) < 0) goto cleanup; |