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 /t/lib-gpg/keyring.gpg | |
| parent | Merge branch 'hs/push-cert-check-cleanup' (diff) | |
| parent | unpack-trees: do not fail reset because of unmerged skipped entry (diff) | |
| download | tgif-284b4449323778b4d92786969e0f922b9bfd8bdf.tar.xz | |
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 't/lib-gpg/keyring.gpg')
0 files changed, 0 insertions, 0 deletions