| commit | 03c6e97f809e5b89089a2c689d6a319e8d471455 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:37:12 +0000 (18 21:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:37:12 +0000 (18 21:37 -0800) | ||
| tree | 35c4f6f2b801f9979feb2aee65578b575bac39bd | treesnapshot (tar.gz zip) |
| parent | c8cba79181abc139d7cba364bf868875426fc2c1 | commitdiff |
| parent | 814035c12a07927ea03350184a14f869cdce7276 | commitdiff |
Merge branch 'maint-1.6.4' into maint-1.6.5
* maint-1.6.4:
Fix mis-backport of t7002
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
* maint-1.6.4:
Fix mis-backport of t7002
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
| builtin-branch.c | diff1 | diff2 | blobhistory |
| builtin-checkout.c | diff1 | diff2 | blobhistory |
| builtin-commit.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| t/t7102-reset.sh | diff1 | diff2 | blobhistory |