]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffa4c36 6eba621)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.