git diff --cached
git config --global rerere.enabled true
--autosquash, --no-autosquash
When the commit log message begins with "squash! ..." or
"fixup! ..." or "amend! ...", and there is already a commit in
the todo list that matches the same ..., automatically modify
the todo list of rebase -i, so that the commit marked for
--rerere-autoupdate, --no-rerere-autoupdate
Allow the rerere mechanism to update the index with the result
of auto-conflict resolution if possible.
β’ --rebase-merges