Merge branch 'jc/add-refresh-unmerged'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:10 +0000 (13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:30:10 +0000 (13:30 -0800)
commit883a2a35043ca4eb238c92e94a66bd04a1fb833a
treed331ee33718e44828a4e1f50dd241ef5b7e6fd38
parentef8adcadfef2300d853016d26e7d2d0429b98a76
parent3d1f148c3381de410a9b02a05bde05cd0fb17a0c
Merge branch 'jc/add-refresh-unmerged'

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