diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:48 -0700 |
| commit | 284b4449323778b4d92786969e0f922b9bfd8bdf (patch) | |
| tree | 2044e74849a06ddd220cc7310295aeaf55a8bc0c /commit-graph.c | |
| parent | 6fc7de1a1f0cca63899e67cc8e96fbdb3be73019 (diff) | |
| parent | b33fdfc34cda95f92cc7a50e5c81b87f8ee65eef (diff) | |
Merge branch 'mk/merge-in-sparse-checkout'
"git reset --merge" (hence "git merge ---abort") and "git reset --hard"
had trouble working correctly in a sparsely checked out working
tree after a conflict, which has been corrected.
* mk/merge-in-sparse-checkout:
unpack-trees: do not fail reset because of unmerged skipped entry
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions