]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d12d8ec 1d718a5)
Merge branch 'js/checkout-untracked-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:19:03 +0000 (16:19 -0700)
* js/checkout-untracked-symlink:
  do not overwrite untracked symlinks
  Demonstrate breakage: checkout overwrites untracked symlink with directory


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.