Merge branch 'jc/unresolve' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 20 Apr 2006 06:52:30 +0000 (23:52 -0700)
commitf31613d45afa1e5c87c4a9a964ef9b474ef73932
tree5359448439bd574c0727e7c21b4e238b197645b6
parentc95fa67fd8dc8b5448e1dd33ed25a6dcea97ee49
parent2bd452d3b9f62ecc3406307cd6a5553856d21ff2
Merge branch 'jc/unresolve' into next

* jc/unresolve:
  git-update-index --unresolve
.gitignore
Makefile