diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 22:47:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 22:47:51 +0200 |
| commit | 2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch) | |
| tree | f3405fe2afe9542f5c64fbfe749fac76fb5000bf /configure.ac | |
| parent | MinGW: avoid collisions between "tags" and "TAGS" (diff) | |
| parent | Add global and system-wide gitattributes (diff) | |
| download | git-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.xz git-2851e8eba52e98d3112417952a24d82ae9d8c0eb.zip | |
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.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 56731c35c9..cc55b6d4f7 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.) # |