| commit | 75618f1106b95defafca698d5cfdfd3dfb3a7e3c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Mar 2011 23:54:04 +0000 (9 15:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 9 Mar 2011 23:54:04 +0000 (9 15:54 -0800) | ||
| tree | 6d709e2f24f42211664b74c86892c963acb25e77 | treesnapshot (tar.gz zip) |
| parent | 3814888a634850a13afbf74146dbad6ded20bb91 | commitdiff |
| parent | 1d718a5108f905e3c64f9fa791e67a52bd926457 | commitdiff |
Merge branch 'js/checkout-untracked-symlink'
* 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