author | Junio C Hamano <gitster@pobox.com> | |
Sun, 10 Jan 2010 08:52:04 +0000 (00:52 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 10 Jan 2010 08:52:04 +0000 (00:52 -0800) | ||
commit | 83b10ca25fd49d25561fd6344bd8e40b8987f50a | |
tree | 8a57673412f8a5d9ebc1ba59c2101119e8a5bf08 | tree | snapshot |
parent | 15515b73716a6ead5a5a348a7d04cc7d73c74bff | commit | diff |
parent | 8fb5d44a47dd3657c8be0de5dcf220935b04e98e | commit | diff |
Merge branch 'maint'
* maint:
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
Documentation: tiny git config manual tweaks
Documentation: git gc packs refs by default now
checkout -m: do not try to fall back to --merge from an unborn branch
* maint:
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
Documentation: tiny git config manual tweaks
Documentation: git gc packs refs by default now
checkout -m: do not try to fall back to --merge from an unborn branch
Documentation/config.txt | diff1 | | diff2 | | blob | history |