diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-07 16:09:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 16:09:17 -0700 |
| commit | 39f319f4d51966419c0725d1145677457d6f162a (patch) | |
| tree | d81fb254d13d9ea7325128944721b9ebc5da0fba /t/t7600-merge.sh | |
| parent | Fix grammar in git-rev-parse(1). (diff) | |
| parent | git-svn.perl: workaround assertions in svn library 1.5.0 (diff) | |
| download | tgif-39f319f4d51966419c0725d1145677457d6f162a.tar.xz | |
Merge branch 'qq/maint' (early part) into maint
* 'qq/maint' (early part):
git-svn.perl: workaround assertions in svn library 1.5.0
mailinfo: feed the correct line length to decode_transfer_encoding()
git-clone: remove leftover debugging fprintf().
Fix "config_error_nonbool" used with value instead of key
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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions