From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Jul 2008 01:33:16 +0000 (-0700)
Subject: Merge branch 'qq/maint'
X-Git-Tag: v1.6.0-rc0~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08b51f51e6a4cf2f5ad4b893707f1337a450e499;p=git.git

Merge branch 'qq/maint'

* qq/maint:
  clone -q: honor "quiet" option over native transports.
  attribute documentation: keep EXAMPLE at end
  builtin-commit.c: Use 'git_config_string' to get 'commit.template'
  http.c: Use 'git_config_string' to clean up SSL config.
  diff.c: Use 'git_config_string' to get 'diff.external'
  convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
  builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
  Documentation cvs: Clarify when a bare repository is needed
  Documentation: be precise about which date --pretty uses

Conflicts:

	Documentation/gitattributes.txt
---

08b51f51e6a4cf2f5ad4b893707f1337a450e499
diff --cc Documentation/gitattributes.txt
index 6a246eb1f,ef06d94ca..d7b41142d
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -450,6 -450,23 +450,29 @@@ String:
  	variable.
  
  
+ Creating an archive
+ ~~~~~~~~~~~~~~~~~~~
+ 
++`export-ignore`
++^^^^^^^^^^^^^^^
++
++Files and directories with the attribute `export-ignore` won't be added to
++archive files.
++
+ `export-subst`
+ ^^^^^^^^^^^^^^
+ 
+ If the attribute `export-subst` is set for a file then git will expand
+ several placeholders when adding this file to an archive.  The
 -expansion depends on the availability of a commit ID, i.e. if
++expansion depends on the availability of a commit ID, i.e., if
+ linkgit:git-archive[1] has been given a tree instead of a commit or a
+ tag then no replacement will be done.  The placeholders are the same
+ as those for the option `--pretty=format:` of linkgit:git-log[1],
+ except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
+ in the file.  E.g. the string `$Format:%H$` will be replaced by the
+ commit hash.
+ 
+ 
  EXAMPLE
  -------