diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:02:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 13:02:24 -0800 |
| commit | ce67b3eed896e0884ca4cdc2edce9a032cefe45a (patch) | |
| tree | b48e06fc2f1b6ce179a78d0f2689c7743ff8a3a7 /diffcore-order.c | |
| parent | cae7151e252324e9304d6480a74d89ba7ed9aa8f (diff) | |
| parent | f08aa017675bffe2359e0122cff2e447486b97c1 (diff) | |
| download | git-ce67b3eed896e0884ca4cdc2edce9a032cefe45a.tar.gz git-ce67b3eed896e0884ca4cdc2edce9a032cefe45a.tar.xz | |
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
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions