author | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Nov 2011 22:54:45 +0000 (15:54 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 1 Nov 2011 22:54:46 +0000 (15:54 -0700) |
* bc/attr-ignore-case:
attr.c: respect core.ignorecase when matching attribute patterns
attr: read core.attributesfile from git_default_core_config
builtin/mv.c: plug miniscule memory leak
cleanup: use internal memory allocation wrapper functions everywhere
attr.c: avoid inappropriate access to strbuf "buf" member
Conflicts:
remote.c
attr.c: respect core.ignorecase when matching attribute patterns
attr: read core.attributesfile from git_default_core_config
builtin/mv.c: plug miniscule memory leak
cleanup: use internal memory allocation wrapper functions everywhere
attr.c: avoid inappropriate access to strbuf "buf" member
Conflicts:
remote.c
Trivial merge