Enable rerere (reuse recorded resolution) to simplify rebase