If you haven't yet, find `git rerere` as well