| commit | 284b4449323778b4d92786969e0f922b9bfd8bdf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Jul 2018 21:50:48 +0000 (24 14:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Jul 2018 21:50:48 +0000 (24 14:50 -0700) | ||
| tree | 2044e74849a06ddd220cc7310295aeaf55a8bc0c | treesnapshot (tar.gz zip) |
| parent | 6fc7de1a1f0cca63899e67cc8e96fbdb3be73019 | commitdiff |
| parent | b33fdfc34cda95f92cc7a50e5c81b87f8ee65eef | commitdiff |
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
"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
| unpack-trees.c | diff1 | diff2 | blobhistory |