From 528efa69e767efb168abd4c7020596faf2610d52 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Wed, 12 Jun 2024 23:27:01 +0200
Subject: [PATCH] autopushed

---
 .../adding a search engine.md => adding a search engine.md | 0
 git rebase.md                                              | 7 +++++++
 journal/git rebase.md                                      | 7 -------
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename journal/adding a search engine.md => adding a search engine.md (100%)
 delete mode 100644 journal/git rebase.md

diff --git a/journal/adding a search engine.md b/adding a search engine.md
similarity index 100%
rename from journal/adding a search engine.md
rename to adding a search engine.md
diff --git a/git rebase.md b/git rebase.md
index 308f2f635..0c0abf543 100644
--- a/git rebase.md	
+++ b/git rebase.md	
@@ -3,3 +3,10 @@
 - 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.
+```
+
diff --git a/journal/git rebase.md b/journal/git rebase.md
deleted file mode 100644
index 766a5a28b..000000000
--- a/journal/git rebase.md	
+++ /dev/null
@@ -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.
-```
-