From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2012 23:48:46 +0000 (-0800)
Subject: Merge branch 'maint-1.7.7' into maint
X-Git-Tag: v1.7.8.4~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d899cf559b6a93006993752e7a89d13606380227;p=git.git

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN
---

d899cf559b6a93006993752e7a89d13606380227