aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-01 16:19:03 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-01 16:19:03 -0700
commit46a1f0728c6b5a886424e74c8bcacedf355eb918 (patch)
tree4b3e2bf7d605858408c17e0774248a0f9af227ec /contrib
parentd12d8ec9d728b0ce148f5a5caa68c858ef180d30 (diff)
parent1d718a5108f905e3c64f9fa791e67a52bd926457 (diff)
downloadgit-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.gz
git-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.xz
Merge branch 'js/checkout-untracked-symlink' into maint
* js/checkout-untracked-symlink: do not overwrite untracked symlinks Demonstrate breakage: checkout overwrites untracked symlink with directory
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions