Merge branch 'jc/maint-reset-remove-unmerged-new' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:36:20 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Nov 2008 21:36:20 +0000 (13:36 -0800)
commitd11ddaff021be8006e71b43a5205c48f2dac7f18
tree65f7e74345440c22103ec9ee1fddbb4a834fc34e
parent581000a4196d196d221bb6164a49a8a52ce30730
parentd1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65
Merge branch 'jc/maint-reset-remove-unmerged-new' into maint

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