Merge branch 'qq/maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jul 2008 01:33:16 +0000 (18:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jul 2008 01:33:16 +0000 (18:33 -0700)
* 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

No differences found