summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-18 15:52:08 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-18 15:52:08 -0800
commit6e06367ab0586189940a7f08c394d13fce14e87f (patch)
tree01a13b862eff3cea78ddf35578761af9117386c2 /GIT-VERSION-GEN
parent32c94f97b01f220dbabaec1a986d9596f45e5da5 (diff)
parentc572f491e545f3fe76a966e418139fc9755a910f (diff)
downloadgit-6e06367ab0586189940a7f08c394d13fce14e87f.tar.gz
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
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions