Merge branch 'po/etc-gitattributes'
commit2851e8eba52e98d3112417952a24d82ae9d8c0eb
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:47:51 +0000 (29 13:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Sep 2010 20:47:51 +0000 (29 13:47 -0700)
treef3405fe2afe9542f5c64fbfe749fac76fb5000bf
parent2f76919517e98bb5e979d6c8c7bbc3478a066a21
parent6df42ab98480dcac473ca7d701cfca4a0051d0c1
Merge branch 'po/etc-gitattributes'

* po/etc-gitattributes:
  Add global and system-wide gitattributes

Conflicts:
Documentation/config.txt
Makefile
Documentation/config.txt
Documentation/gitattributes.txt
Makefile
configure.ac
t/t0003-attributes.sh