| commit | 814035c12a07927ea03350184a14f869cdce7276 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:37:06 +0000 (18 21:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:37:06 +0000 (18 21:37 -0800) | ||
| tree | 2bd7e76205be964e7379cc2d9fd2e7dc71003599 | treesnapshot (tar.gz zip) |
| parent | 18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa | commitdiff |
| parent | 011c181cc656c8b3e48882729d1b6238e8c5c537 | commitdiff |
Merge branch 'maint-1.6.3' into maint-1.6.4
* maint-1.6.3:
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
Conflicts:
builtin-commit.c
* maint-1.6.3:
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
Conflicts:
builtin-commit.c