![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2012 23:48:46 +0000 (15:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Jan 2012 23:48:46 +0000 (15:48 -0800) | ||
| commit | d899cf559b6a93006993752e7a89d13606380227 | |
| tree | 267c22ffce9a9d705f48749d650ce2b62b690aa8 | tree | snapshot |
| parent | ab8a78084b7159d99dae2905e1a3ff04c1500a6d | commit | diff |
| parent | 00653435488f5ed86c5d6dc411fa14fa56f5e3bc | commit | diff |
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
* maint-1.7.7:
Git 1.7.7.6
diff-index: enable recursive pathspec matching in unpack_trees
Conflicts:
GIT-VERSION-GEN