![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 16 May 2006 01:15:26 +0000 (18:15 -0700) | ||
| commit | 8701ea0f627dcba4bb75570f87df9c93985d397a | |
| tree | 77ef1b918b14b04d2f294c32bb8aca12cb40da06 | tree | snapshot |
| parent | 63166cd64fe7f0cb8290ad33e0e7cd0273bc551d | commit | diff |
| parent | 6d6776cb497ea7fbf5fe43912dbe3286f76c9933 | commit | diff |
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
* 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