Merge branch 'po/etc-gitattributes' into next

* po/etc-gitattributes:
  Add global and system-wide gitattributes

Conflicts:
	Documentation/config.txt
	Makefile

diff --cc Documentation/config.txt
index d82c0da2cf470dbfe7936762d4645b7509647177,a043d55459424cc02d4ec63637c523bdfc011894..e6d74e6ade440a9ea26c4e2f22d54aad6cf6044e
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -450,15 -450,12 +450,21 @@@ core.excludesfile:
        to the value of `$HOME` and "{tilde}user/" to the specified user's
        home directory.  See linkgit:gitignore[5].
  
 +core.askpass::
 +      Some commands (e.g. svn and http interfaces) that interactively
 +      ask for a password can be told to use an external program given
 +      via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
 +      environment variable. If not set, fall back to the value of the
 +      'SSH_ASKPASS' environment variable or, failing that, a simple password
 +      prompt. The external program shall be given a suitable prompt as
 +      command line argument and write the password on its STDOUT.
 +
+ core.attributesfile::
+       In addition to '.gitattributes' (per-directory) and
+       '.git/info/attributes', git looks into this file for attributes
+       (see linkgit:gitattributes[5]). Path expansions are made the same
+       way as for `core.excludesfile`.
+ 
  core.editor::
        Commands such as `commit` and `tag` that lets you edit
        messages by launching an editor uses the value of this

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc Makefile
index b7a62cfdf2ca4f05e47d69332976adabb73583e9,eadd2d734bc701cdfeed8ab21e1a2981fb0cefa3..c4dfa1b476616cd873f19fe39a97f1bb78f07910
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1898,7 -1876,9 +1902,9 @@@ builtin/init-db.s builtin/init-db.o: EX
  
  config.s config.o: EXTRA_CPPFLAGS = -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
 -http.s http.o: EXTRA_CPPFLAGS = -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
+ attr.s attr.o: EXTRA_CPPFLAGS = -DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"'
+ 
 +http.s http.o: EXTRA_CPPFLAGS = -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
  
  ifdef NO_EXPAT
  http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT

diff --cc configure.ac
Simple merge

diff --cc t/t0003-attributes.sh
Simple merge