![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 21:02:24 +0000 (13:02 -0800) | ||
| commit | ce67b3eed896e0884ca4cdc2edce9a032cefe45a | |
| tree | b48e06fc2f1b6ce179a78d0f2689c7743ff8a3a7 | tree | snapshot |
| parent | cae7151e252324e9304d6480a74d89ba7ed9aa8f | commit | diff |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 | commit | diff |
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
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh