From 73ae6b550d551bde7a9488d35dbdbda2ee8a3758 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Wed, 11 Aug 2021 12:49:50 +0200
Subject: [PATCH] Default commit message, part of an automated flow.

---
 golden rule of rebasing.md | 4 ++++
 journal/2021-08-11.md      | 1 +
 merge vs rebase.md         | 5 +++++
 twitter analytics.md       | 2 ++
 4 files changed, 12 insertions(+)
 create mode 100644 golden rule of rebasing.md
 create mode 100644 merge vs rebase.md
 create mode 100644 twitter analytics.md

diff --git a/golden rule of rebasing.md b/golden rule of rebasing.md
new file mode 100644
index 000000000..b4738a58c
--- /dev/null
+++ b/golden rule of rebasing.md	
@@ -0,0 +1,4 @@
+# golden rule of rebasing
+
+- [[go]] https://www.atlassian.com/git/tutorials/merging-vs-rebasing#the-golden-rule-of-rebasing
+  - "never use [[rebase]] on public branches"
\ No newline at end of file
diff --git a/journal/2021-08-11.md b/journal/2021-08-11.md
index 5307d7319..ded3baf19 100644
--- a/journal/2021-08-11.md
+++ b/journal/2021-08-11.md
@@ -2,5 +2,6 @@
 
 - [[git]]
   - [[git rebase]]
+  - [[merge vs rebase]]
 - [[twitter analytics]]
 - [[cormen]]
diff --git a/merge vs rebase.md b/merge vs rebase.md
new file mode 100644
index 000000000..4c14f31fc
--- /dev/null
+++ b/merge vs rebase.md	
@@ -0,0 +1,5 @@
+# merge vs rebase
+
+- [[go]] https://www.atlassian.com/git/tutorials/merging-vs-rebasing
+- [[pull]] [[golden rule of rebasing]]
+
diff --git a/twitter analytics.md b/twitter analytics.md
new file mode 100644
index 000000000..70b095ce7
--- /dev/null
+++ b/twitter analytics.md	
@@ -0,0 +1,2 @@
+# twitter analytics
+