git rebase

• an alternative to [[merge]]

• it squashes history

• from https://strongbox.github.io/developer-guide/git/rebase-vs-merge.html, the [[golden rule of rebasing]]:

The Golden rule of Rebasing
So, before you run git rebase, always ask yourself, “Is anyone else looking at this branch?”. If the answer is yes, take your hands off the keyboard and start thinking about a non-destructive way to make your changes. Otherwise, you’re safe to re-write history as much as you like.