Code

Merge branch 'jc/add-refresh-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:06:23 +0000 (17:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 01:06:23 +0000 (17:06 -0800)
commit660e20f5c72ba363c08f0d3fca60c9680f296c40
treeb1f64c45ac088b1930e3127c86e6246f04a03805
parent8f2c0995b611ef2f53fc29dc5ea3721a803ec1c2
parent3d1f148c3381de410a9b02a05bde05cd0fb17a0c
Merge branch 'jc/add-refresh-unmerged' into maint

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