Fix git churn to order correctly