![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 20:47:51 +0000 (13:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 20:47:51 +0000 (13:47 -0700) | ||
| commit | 2851e8eba52e98d3112417952a24d82ae9d8c0eb | |
| tree | f3405fe2afe9542f5c64fbfe749fac76fb5000bf | tree | snapshot |
| parent | 2f76919517e98bb5e979d6c8c7bbc3478a066a21 | commit | diff |
| parent | 6df42ab98480dcac473ca7d701cfca4a0051d0c1 | commit | diff |
Merge branch 'po/etc-gitattributes'
* 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 |