summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-29 13:47:51 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-29 13:47:51 -0700
commit2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch)
treef3405fe2afe9542f5c64fbfe749fac76fb5000bf /builtin.h
parent2f76919517e98bb5e979d6c8c7bbc3478a066a21 (diff)
parent6df42ab98480dcac473ca7d701cfca4a0051d0c1 (diff)
downloadgit-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.gz
Merge branch 'po/etc-gitattributes'
* po/etc-gitattributes: Add global and system-wide gitattributes Conflicts: Documentation/config.txt Makefile
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions