| commit | c5034673fd92b6278e6c9d55683770ec01fafc89 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:49:47 +0000 (10 00:49 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:49:47 +0000 (10 00:49 -0800) | ||
| tree | 04435179aa4d3dfb0b2ac746072731929d7adcf1 | treesnapshot (tar.gz zip) |
| parent | 405923761a8cd12d0047c215b69df9c6aa96723e | commitdiff |
| parent | 96aa7adda3b0254e4b9904f53bb38cd76bfea7bb | commitdiff |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
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.1:
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