[aidenn0]

I don't cherry-pick much in git, but I'm guesing rerere doesn't work with it?

[mikepurvis]

I think it probably would for at least some cases, and I'll give it a try definitely.