]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'bc/attr-ignore-case' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:54:45 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Nov 2011 22:54:46 +0000 (15:54 -0700)
commita4fdd79f13ec0551be94d7a3ac57e87434239f11
treec1d5d4bf292dab6bd36270f411e99177b3d6bd1d
parentffa4c364f4ec090438de48a986f02cdeb302b46c
parent6eba6210d9824445c29b75f9c618abbec5184afd
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