| commit | a4fdd79f13ec0551be94d7a3ac57e87434239f11 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Nov 2011 22:54:45 +0000 (1 15:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 1 Nov 2011 22:54:46 +0000 (1 15:54 -0700) | ||
| tree | c1d5d4bf292dab6bd36270f411e99177b3d6bd1d | treesnapshot (tar.gz zip) |
| parent | ffa4c364f4ec090438de48a986f02cdeb302b46c | commitdiff |
| parent | 6eba6210d9824445c29b75f9c618abbec5184afd | commitdiff |
Merge branch 'bc/attr-ignore-case' into maint
* 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
* 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