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: https://git.lorimer.id.au/gitweb.git/diff_plain/08b51f51e6a4cf2f5ad4b893707f1337a450e499?hp=08b51f51e6a4cf2f5ad4b893707f1337a450e499

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
---