![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Jan 2010 23:40:21 +0000 (15:40 -0800) | ||
| commit | 3259ada4c79eb1e8213ab44c7ce3ec6f7775cd33 | |
| tree | 4e39d2295155392349986d5ae49fa6506e960560 | tree | snapshot |
| parent | 0ad6f1a988312ebc2733126cf17f694d7008659f | commit | diff |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 | commit | diff |
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
* sb/maint-octopus:
octopus: remove dead code
octopus: reenable fast-forward merges
octopus: make merge process simpler to follow
Conflicts:
git-merge-octopus.sh