Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:52:08 +0000 (15:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:52:08 +0000 (15:52 -0800)
* maint:
Git 1.7.8.4
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
GIT-VERSION-GEN

Trivial merge