]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sb/maint-octopus' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800)
commitce67b3eed896e0884ca4cdc2edce9a032cefe45a
treeb48e06fc2f1b6ce179a78d0f2689c7743ff8a3a7
parentcae7151e252324e9304d6480a74d89ba7ed9aa8f
parentf08aa017675bffe2359e0122cff2e447486b97c1
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