commit | 011c181cc656c8b3e48882729d1b6238e8c5c537 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Jan 18 21:29:47 2010 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Jan 18 21:29:47 2010 -0800 |
tree | 4f4a1c516c474ed6ff0327f852e783d0efa53667 | |
parent | ba7e81430a32614982172c7064c01db43f55b4bb [diff] | |
parent | c5034673fd92b6278e6c9d55683770ec01fafc89 [diff] |
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