Merge branch 'jc/diff-index-unpack' into maint
commitfc26f57b847b86ba330ea543a6dfc86a10d4cce3
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:36 +0000 (15 20:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:46:36 +0000 (15 20:46 -0700)
tree91e48380bbabaa47699db38c00c5c056d6ea48d2
parent57ded055c419183e43fd7841c1f9d2e774fa96e3
parent2f88c19700feb8db8f116f94bf558e61c82d543c
Merge branch 'jc/diff-index-unpack' into maint

* jc/diff-index-unpack:
  diff-index: pass pathspec down to unpack-trees machinery
  unpack-trees: allow pruning with pathspec
  traverse_trees(): allow pruning with pathspec
diff-lib.c
unpack-trees.c
unpack-trees.h