![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jan 2010 08:48:47 +0000 (00:48 -0800) | ||
| commit | 96aa7adda3b0254e4b9904f53bb38cd76bfea7bb | |
| tree | d1eb57fbedb2e8c321889794c60ded86a9a2e88b | tree | snapshot |
| parent | 70d7099916c9621e157c620f9cc7fc982f109c55 | commit | diff |
| parent | 0606c36a73449e76d8f6133253c1eff291ee8c97 | commit | diff |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
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".
* maint-1.6.0:
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".
| builtin-branch.c | diff1 | | diff2 | | blob | history |
| builtin-checkout.c | diff1 | | diff2 | | blob | history |