From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Aug 2011 22:00:08 +0000 (-0700)
Subject: Merge branch 'jc/maint-reset-unmerged-path'
X-Git-Tag: v1.7.7-rc0~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1df561fb4861708ce208488aa307516c0ecfa968;p=thirdparty%2Fgit.git

Merge branch 'jc/maint-reset-unmerged-path'

* jc/maint-reset-unmerged-path:
  reset [<commit>] paths...: do not mishandle unmerged paths
---

1df561fb4861708ce208488aa307516c0ecfa968