Search notes:
git rerere
REuse REcorded REsolution of conflicted
merges
.
See also
git commands
Index