diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
| commit | 46a1f0728c6b5a886424e74c8bcacedf355eb918 (patch) | |
| tree | 4b3e2bf7d605858408c17e0774248a0f9af227ec /builtin/commit.c | |
| parent | Merge "checkout ambiguous ref bugfix" into maint (diff) | |
| parent | do not overwrite untracked symlinks (diff) | |
| download | git-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.gz git-46a1f0728c6b5a886424e74c8bcacedf355eb918.zip | |
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions