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