summaryrefslogtreecommitdiff
path: root/Documentation/howto
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:48 -0700
commit284b4449323778b4d92786969e0f922b9bfd8bdf (patch)
tree2044e74849a06ddd220cc7310295aeaf55a8bc0c /Documentation/howto
parentMerge branch 'hs/push-cert-check-cleanup' (diff)
parentunpack-trees: do not fail reset because of unmerged skipped entry (diff)
downloadtgif-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 'Documentation/howto')
0 files changed, 0 insertions, 0 deletions