Files
garden/git rebase.md
2024-06-12 23:27:01 +02:00

13 lines
503 B
Markdown
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
# 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, youre safe to re-write history as much as you like.
```