Re-jigged git order