Merge branch 'jc/add-refresh-unmerged' into next
commit09f8721ff1fa40fe1612860ec3aa693f8f5ea5ad
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 00:02:42 +0000 (21 16:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Feb 2012 00:02:42 +0000 (21 16:02 -0800)
treef37f993f487fdd3f5452665ba3316248304bd87c
parentcb71d0e4f2b7cfaa31a14a02348da50bb128ce25
parent3d1f148c3381de410a9b02a05bde05cd0fb17a0c
Merge branch 'jc/add-refresh-unmerged' into next

* jc/add-refresh-unmerged:
  refresh_index: do not show unmerged path that is outside pathspec