From: Junio C Hamano <junkio@cox.net>
Date: Tue, 16 May 2006 01:15:26 +0000 (-0700)
Subject: Merge branch 'lt/oneway'
X-Git-Tag: v1.4.0-rc1~139
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8701ea0f627dcba4bb75570f87df9c93985d397a;p=git.git

Merge branch 'lt/oneway'

* lt/oneway:
  read-tree --reset -u fix.
  read-tree -u one-way merge fix to check out locally modified paths.
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files
---

8701ea0f627dcba4bb75570f87df9c93985d397a