I think this is something git rerere is supposed to help with