commit | ce67b3eed896e0884ca4cdc2edce9a032cefe45a | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Wed Jan 20 13:02:24 2010 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Wed Jan 20 13:02:24 2010 -0800 |
tree | b48e06fc2f1b6ce179a78d0f2689c7743ff8a3a7 | |
parent | cae7151e252324e9304d6480a74d89ba7ed9aa8f [diff] | |
parent | f08aa017675bffe2359e0122cff2e447486b97c1 [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