From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2010 23:40:21 +0000 (-0800)
Subject: Merge branch 'sb/maint-octopus'
X-Git-Tag: v1.7.0-rc0~123
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33;p=git.git

Merge branch 'sb/maint-octopus'

* sb/maint-octopus:
  octopus: remove dead code
  octopus: reenable fast-forward merges
  octopus: make merge process simpler to follow

Conflicts:
	git-merge-octopus.sh
---

3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33