flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-08 07:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

autopushed

Browse Source
This commit is contained in:
Flancian
2024-06-12 23:27:01 +02:00
parent b6dc516cc9
commit 528efa69e7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
journal/adding a search engine.md → adding a search engine.md
View File
git rebase.md
+7
View File
@@ -3,3 +3,10 @@
- an alternative to [[merge]] - an alternative to [[merge]]
- it squashes history - 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.
```
journal/git rebase.md
-7
View File
@@ -1,7 +0,0 @@
- 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.
```