summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-29 20:47:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-29 20:47:51 (GMT)
commit2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch)
treef3405fe2afe9542f5c64fbfe749fac76fb5000bf /configure.ac
parent2f76919517e98bb5e979d6c8c7bbc3478a066a21 (diff)
parent6df42ab98480dcac473ca7d701cfca4a0051d0c1 (diff)
downloadgit-2851e8eba52e98d3112417952a24d82ae9d8c0eb.zip
git-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.gz
git-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.bz2
Merge branch 'po/etc-gitattributes'
* po/etc-gitattributes: Add global and system-wide gitattributes Conflicts: Documentation/config.txt Makefile
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 56731c3..cc55b6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,15 @@ GIT_PARSE_WITH(iconv))
GIT_PARSE_WITH_SET_MAKE_VAR(gitconfig, ETC_GITCONFIG,
Use VALUE instead of /etc/gitconfig as the
global git configuration file.
- If VALUE is not fully qualified it will be interpretted
+ If VALUE is not fully qualified it will be interpreted
+ as a path relative to the computed prefix at runtime.)
+
+#
+# Allow user to set ETC_GITATTRIBUTES variable
+GIT_PARSE_WITH_SET_MAKE_VAR(gitattributes, ETC_GITATTRIBUTES,
+ Use VALUE instead of /etc/gitattributes as the
+ global git attributes file.
+ If VALUE is not fully qualified it will be interpreted
as a path relative to the computed prefix at runtime.)
#