Merge branch 'nd/pathspec-recursion-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:16:43 +0000 (15:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:16:43 +0000 (15:16 -0800)
* nd/pathspec-recursion-cleanup:
diff-index: enable recursive pathspec matching in unpack_trees
Document limited recursion pathspec matching with wildcards

Trivial merge