From 83218ae648a6d2010d8667640588d92dfdbe375e Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 27 Aug 2020 17:21:39 +0200
Subject: [PATCH] posts: git-basics: add points to skeleton

---
 content/posts/git-basics.md | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/content/posts/git-basics.md b/content/posts/git-basics.md
index e7575bf..989debf 100644
--- a/content/posts/git-basics.md
+++ b/content/posts/git-basics.md
@@ -58,15 +58,33 @@ project but have not explored some of its more powerful features.
   * Commit early, commit often
   * Clean-up merge requests
 
-## Branches and decentralised distribution
+* Lost? Here's a map
+  * History manipulation can lose commits and other work
+  * `reflog` can help you find it again
 
-* Local/remote branch
-* Remote-tracking branches?
-  * Why doesn't my new `dev` branch push to the remote
-* Multiple remotes
-  * Example use-case: shared branches and local sandboxes
-* `pull`/`fetch`
-  * Our lord and savior: `git pull --rebase`
+## Tips and tricks
+
+Here are some basic pieces of knowledge which don't really belong to any other
+section, which I think needs to be said.
+
+### The importance of small commits
+
+* Small commits
+  * Why they're useful
+    * Blame
+    * Revert
+    * Review & scope
+  * `git add -p`
+
+* Stubborn rebase
+  * Example from `42sh`
+  * `git rerere`
+
+* Splitting a file with `blame` history
+  * Give attribution to `Old New Thing`
+
+* Binary search for a regression
+  * `bissect`
 
 ## Going further