Just a quick summary mostly for myself:

How to use git pull --rebase to keep your team’s commit history clean.

Command for creating the ‘git pr‘ alias (so you can copy-paste): git config --global alias.pr "pull --rebase"

1. Always try git pull --rebase first. It if works, you’re done!
2. If you get a merge conflix, you can undo everything with git rebase --abort
3. Then just pull “normally” using git pull, or do an interactive rebase (advanced)