From: Junio C Hamano <junkio@cox.net>
Date: Sat, 20 May 2006 00:02:22 +0000 (-0700)
Subject: Merge branch 'jc/read-tree-safety'
X-Git-Tag: v1.4.0-rc1~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0081e36c9dc3c201e22f12ebebadfff88fa32b91;p=git.git

Merge branch 'jc/read-tree-safety'

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

0081e36c9dc3c201e22f12ebebadfff88fa32b91