diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:52:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:52:04 -0800 |
| commit | 83b10ca25fd49d25561fd6344bd8e40b8987f50a (patch) | |
| tree | 8a57673412f8a5d9ebc1ba59c2101119e8a5bf08 /t/t7602-merge-octopus-many.sh | |
| parent | daemon: consider only address in kill_some_child() (diff) | |
| parent | Merge branch 'maint-1.6.2' into maint (diff) | |
| download | tgif-83b10ca25fd49d25561fd6344bd8e40b8987f50a.tar.xz | |
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
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions