Merge branch 'jc/maint-reset' into maint
commit4df0d7af6be27fe5b0ffef438ef0169607253f66
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jul 2008 04:32:44 +0000 (2 21:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jul 2008 04:32:44 +0000 (2 21:32 -0700)
tree8d76ec961e9667b4a6efedecb3fd590e38875ba8
parent14d4642e2a472ba4c06e10a3f5623d944b869314
parentdfc8f39e4346d000052c39ef7cb6bfe8fdb48c51
Merge branch 'jc/maint-reset' into maint

* jc/maint-reset:
  Allow "git-reset path" when unambiguous