Merge branch 'jc/maint-reset-remove-unmerged-new'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2008 20:48:41 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2008 20:48:41 +0000 (13:48 -0700)
commit500ac7f42e7f2ae42e33be3bbb7120b788175b1d
treeae509ca36de687dd45d3a52532784f00b78daab0
parent20341dd970b331fd721225ca630548ec1e90d8a5
parentd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65
Merge branch 'jc/maint-reset-remove-unmerged-new'

* jc/maint-reset-remove-unmerged-new:
  reset --hard/read-tree --reset -u: remove unmerged new paths
read-cache.c