![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Feb 2010 08:06:11 +0000 (00:06 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Feb 2010 08:06:11 +0000 (00:06 -0800) | ||
| commit | 153559a964f436aeb909e3b7e86ceaa998aeed68 | |
| tree | a6f3e2ea703d3899a0447ec2610b8d3a73d7a4dd | tree | snapshot |
| parent | 4b683658be0bd21eac7243bac6fb083e1cc00060 | commit | diff |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 | commit | diff |
Merge branch 'sb/maint-octopus' into maint-1.6.5
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow