git reword without resolving merge conflicts again

Question

Is it possible to change commit messages using git rebase, but without having to re-resolve merge conflicts?

I need to bowdlerize an older repo and I don\'t want to

Answer 1

Note: since The contrib/rerere-train.sh script is supposed to re-train rerere (you can see a manual retraining here)

To make sure rerere forgets all its current rebase resolution, you now have an official option with Git 2.14.x/2.15 (Q3 2017) for contrib/rerere-train: the --overwrite flag.

See commit ad53bf7 (26 Jul 2017) by Raman Gupta (rocketraman).
^{(Merged by Junio C Hamano -- gitster -- in commit aec68c3, 11 Aug 2017)}

contrib/rerere-train: optionally overwrite existing resolutions

Provide the user an option to overwrite existing resolutions using an --overwrite flag.

This might be used, for example, if the user knows that they already have an entry in their rerere cache for a conflict, but wish to drop it and retrain based on the merge commit(s) passed to the rerere-train script.