diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:51:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:51:54 -0800 |
| commit | 8fb5d44a47dd3657c8be0de5dcf220935b04e98e (patch) | |
| tree | 838aeb98297028e098849fd8a589b36a92ee89dc /gitk-git | |
| parent | Documentation: tiny git config manual tweaks (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint-1.6.2 (diff) | |
| download | tgif-8fb5d44a47dd3657c8be0de5dcf220935b04e98e.tar.xz | |
Merge branch 'maint-1.6.2' into maint
* 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
Conflicts:
diff.c
Diffstat (limited to 'gitk-git')
0 files changed, 0 insertions, 0 deletions