Merge branch 'jc/reupdate' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 6 May 2006 07:20:54 +0000 (00:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 6 May 2006 07:20:54 +0000 (00:20 -0700)
commitaadc81c13bbb103e7db759ba9a98a6f9509831f1
treedc663c8aa0a076a080a81a290f64d8c2474b6e10
parent7bb0d900d72213cacb97cd346c3ed9ac54125f59
parent22293b9c41778bb60f3b07355e1b8e421a503702
Merge branch 'jc/reupdate' into next

* jc/reupdate:
  update-index --again: take optional pathspecs
  update-index --again
  update-index: plug memory leak from prefix_path()
  checkout-index: plug memory leak from prefix_path()
  update-index --unresolve: work from a subdirectory.
checkout-index.c
update-index.c