| commit | 011c181cc656c8b3e48882729d1b6238e8c5c537 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:29:47 +0000 (18 21:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jan 2010 05:29:47 +0000 (18 21:29 -0800) | ||
| tree | 4f4a1c516c474ed6ff0327f852e783d0efa53667 | treesnapshot (tar.gz zip) |
| parent | ba7e81430a32614982172c7064c01db43f55b4bb | commitdiff |
| parent | c5034673fd92b6278e6c9d55683770ec01fafc89 | commitdiff |
Merge branch 'maint-1.6.2' into maint-1.6.3
* maint-1.6.2:
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:
diff.c
* maint-1.6.2:
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:
diff.c