| commit | 08b51f51e6a4cf2f5ad4b893707f1337a450e499 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 6 Jul 2008 01:33:16 +0000 (5 18:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 6 Jul 2008 01:33:16 +0000 (5 18:33 -0700) | ||
| tree | 1ff3a0c83f79c221194ac91ee6c2018d477ec7af | treesnapshot (tar.gz zip) |
| parent | 1fc561d169ac08c411e34a4439894c5201b3d080 | commitdiff |
| parent | 9b373229506c9f563b2e2f053c3f1d932789fbfd | commitdiff |
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
* 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