Code

Merge branch 'jc/read-tree-safety' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 22:54:39 +0000 (15:54 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 17 May 2006 22:54:39 +0000 (15:54 -0700)
commit22b49b7fb960921146ebc7b49fe1f014e828b671
tree4737964c219837cbcf786ff7fb88bb6158fe482a
parentc7e3a75121877ecc8ea60c2d3873a1c6c504ed68
parentfcc387db9bc453dc7e07a262873481af2ee9e5c8
Merge branch 'jc/read-tree-safety' into next

* jc/read-tree-safety:
  read-tree -m -u: do not overwrite or remove untracked working tree files.
read-tree.c