Merge branch 'lt/oneway' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700)
commit5708a6666dd9f6d233836fdc86afef0a408c01b6
treece9b5036804fa69b113e9d8a16dfc1ee40502401
parentc621197a20d42b6b9115d7031bdb49e24f961898
parentc68998f5b5f43717a27da82fac08a76d6588bae7
Merge branch 'lt/oneway' into next

* lt/oneway:
  Simplify "git reset --hard"
  Allow one-way tree merge to remove old files
read-tree.c