![[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) |
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Trivial merge