From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 21:02:24 +0000 (-0800)
Subject: Merge branch 'sb/maint-octopus' into maint
X-Git-Tag: v1.6.6.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce67b3eed896e0884ca4cdc2edce9a032cefe45a;p=git.git

Merge branch 'sb/maint-octopus' into maint

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

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

ce67b3eed896e0884ca4cdc2edce9a032cefe45a