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

diff --cc Documentation/git-cvsimport.txt
Simple merge

diff --cc Documentation/git-cvsserver.txt
Simple merge

diff --cc Documentation/gitattributes.txt
index 6a246eb1fc3229d4ba8f78f015af682eebf885e0,ef06d94ca8dd57762fcefe3b87921799d49dffb6..d7b41142d2c843bc5460f03c73c609b1c53ff4a6
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -450,6 -450,23 +450,29 @@@ String:
        variable.
  
  
 -expansion depends on the availability of a commit ID, i.e. if
+ 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
+ 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
  -------
  

diff --cc Documentation/gitcvs-migration.txt
Simple merge

diff --cc builtin-commit.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc transport.c
Simple merge