![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2012 23:52:08 +0000 (15:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2012 23:52:08 +0000 (15:52 -0800) | ||
| commit | 6e06367ab0586189940a7f08c394d13fce14e87f | |
| tree | 01a13b862eff3cea78ddf35578761af9117386c2 | tree | snapshot |
| parent | 32c94f97b01f220dbabaec1a986d9596f45e5da5 | commit | diff |
| parent | c572f491e545f3fe76a966e418139fc9755a910f | commit | diff |
Merge branch 'maint'
* maint:
Git 1.7.8.4
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN
* maint:
Git 1.7.8.4
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN