![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700) | ||
| commit | f31613d45afa1e5c87c4a9a964ef9b474ef73932 | |
| tree | 5359448439bd574c0727e7c21b4e238b197645b6 | tree | snapshot |
| parent | c95fa67fd8dc8b5448e1dd33ed25a6dcea97ee49 | commit | diff |
| parent | 2bd452d3b9f62ecc3406307cd6a5553856d21ff2 | commit | diff |
Merge branch 'jc/unresolve' into next
* jc/unresolve:
git-update-index --unresolve
* jc/unresolve:
git-update-index --unresolve
| .gitignore | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |