Merge branch 'jc/read-tree-safety'
commit0081e36c9dc3c201e22f12ebebadfff88fa32b91
authorJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 00:02:22 +0000 (19 17:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 00:02:22 +0000 (19 17:02 -0700)
tree5723eac1ee37bf3ae95e7d970b54ac7a6f2644ce
parentedd5cc242820f3eec26329a263e4016a039adee1
parentfcc387db9bc453dc7e07a262873481af2ee9e5c8
Merge branch 'jc/read-tree-safety'

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