Merge branch 'jc/unresolve'
authorJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:05:55 +0000 (02:05 -0700)
commitcdb63506a0d632b4bf81378756b53f30d7198b50
treec1c2be58674fe2bd3423f670dcf646212e471ded
parent3a403e49b90ff30e3253a6a66e8e7cc3a1d33c8f
parent2bd452d3b9f62ecc3406307cd6a5553856d21ff2
Merge branch 'jc/unresolve'

* jc/unresolve:
  git-update-index --unresolve
  Add git-unresolve <paths>...