| commit | a200dc8e62563165df1105eae0e980a44059c6fb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:13 +0000 (17 21:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:14 +0000 (17 21:37 -0700) | ||
| tree | b4133d445668ef81b9f636ee2fc74b141cb6187e | treesnapshot (tar.gz zip) |
| parent | 6e97fccf0c77b15c86e25558d69ce54422ebcf92 | commitdiff |
| parent | 6eba6210d9824445c29b75f9c618abbec5184afd | commitdiff |
Merge branch 'bc/attr-ignore-case'
* 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:
transport-helper.c
* 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:
transport-helper.c
| builtin/check-attr.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| config.c | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |
| t/t0003-attributes.sh | diff1 | diff2 | blobhistory |