![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 14 May 2006 23:58:44 +0000 (16:58 -0700) | ||
| commit | 5708a6666dd9f6d233836fdc86afef0a408c01b6 | |
| tree | ce9b5036804fa69b113e9d8a16dfc1ee40502401 | tree | snapshot |
| parent | c621197a20d42b6b9115d7031bdb49e24f961898 | commit | diff |
| parent | c68998f5b5f43717a27da82fac08a76d6588bae7 | commit | diff |
Merge branch 'lt/oneway' into next
* lt/oneway:
Simplify "git reset --hard"
Allow one-way tree merge to remove old files
* lt/oneway:
Simplify "git reset --hard"
Allow one-way tree merge to remove old files
| read-tree.c | diff1 | | diff2 | | blob | history |