| commit | 52a35ce28698247dbc8c78a4602295ca1bf3620f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 23 Feb 2011 22:23:07 +0000 (23 14:23 -0800) | ||
| tree | 7178e9bd84de443d265c45904747229d69cd2e5d | treesnapshot (tar.gz zip) |
| parent | 2c6e8c9ae5cfa54b23aa4897635f2082d137c963 | commitdiff |
| parent | 1d718a5108f905e3c64f9fa791e67a52bd926457 | commitdiff |
Merge branch 'js/checkout-untracked-symlink' into next
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory