diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-30 00:47:51 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 00:47:51 +0400 |
| commit | 2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch) | |
| tree | f3405fe2afe9542f5c64fbfe749fac76fb5000bf /alias.c | |
| parent | 2f76919517e98bb5e979d6c8c7bbc3478a066a21 (diff) | |
| parent | 6df42ab98480dcac473ca7d701cfca4a0051d0c1 (diff) | |
Merge branch 'po/etc-gitattributes'
* po/etc-gitattributes:
Add global and system-wide gitattributes
Conflicts:
Documentation/config.txt
Makefile
Diffstat (limited to 'alias.c')
0 files changed, 0 insertions, 0 deletions