From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Feb 2010 08:06:11 +0000 (-0800)
Subject: Merge branch 'sb/maint-octopus' into maint-1.6.5
X-Git-Tag: v1.6.6.2~11^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/153559a964f436aeb909e3b7e86ceaa998aeed68?ds=inline;hp=--cc

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
---

153559a964f436aeb909e3b7e86ceaa998aeed68