From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Sep 2010 16:35:57 +0000 (-0700)
Subject: Merge branch 'po/etc-gitattributes' into next
X-Git-Tag: ko-next~224
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dc6441921c56d9a19d2b162b1ce8fd85e0491353;p=git.git

Merge branch 'po/etc-gitattributes' into next

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

Conflicts:
	Documentation/config.txt
	Makefile
---

dc6441921c56d9a19d2b162b1ce8fd85e0491353
diff --cc Documentation/config.txt
index d82c0da2c,a043d5545..e6d74e6ad
--- a/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 Makefile
index b7a62cfdf,eadd2d734..c4dfa1b47
--- a/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)"'
  
+ attr.s attr.o: EXTRA_CPPFLAGS = -DETC_GITATTRIBUTES='"$(ETC_GITATTRIBUTES_SQ)"'
+ 
 -http.s http.o: EXTRA_CPPFLAGS = -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
 +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