Add rerere til

bpugh · Oct 31, 2023 · 39b6fb7 · 39b6fb7
1 parent 9d3ec88
commit 39b6fb7
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/git/rerere.md b/git/rerere.md
@@ -0,0 +1,13 @@
+---
+date: 2023-10-05
+---
+
+# Git rerere
+
+If you've ever had to abort a rebase or merge but didn't want to waste the work you already did resolving merge conflicts, then you should enable the git rerere option:
+
+`git global config rerere.enabled true`
+
+It stands for Reuse Recorded Resolution, and it essentially remembers how you resolved a merge conflict and will automatically reapply it sees it again.
+
+[Resolving conflicts with git-rerere](https://bitbucket.org/blog/resolving-conflicts-with-git-rerere)