![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:57 +0000 (09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:57 +0000 (09:35 -0700) | ||
| commit | dc6441921c56d9a19d2b162b1ce8fd85e0491353 | |
| tree | d5dbe729e78ca222b655e0274c67ca2fb364bdb1 | tree | snapshot |
| parent | 2a33735a7648216fe4c4bc4de1a5bd433147db9e | commit | diff |
| parent | 6df42ab98480dcac473ca7d701cfca4a0051d0c1 | commit | diff |
Merge branch 'po/etc-gitattributes' into next
* po/etc-gitattributes:
Add global and system-wide gitattributes
Conflicts:
Documentation/config.txt
Makefile
* po/etc-gitattributes:
Add global and system-wide gitattributes
Conflicts:
Documentation/config.txt
Makefile
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/gitattributes.txt | diff1 | | diff2 | | blob | history |
| Makefile | diff1 | | diff2 | | blob | history |
| configure.ac | diff1 | | diff2 | | blob | history |
| t/t0003-attributes.sh | diff1 | | diff2 | | blob | history |