From d9a98418f76b666e1148ab7d0fdea7c292559056 Mon Sep 17 00:00:00 2001
From: Camelid <camelidcamel@gmail.com>
Date: Fri, 2 Oct 2020 11:55:43 -0700
Subject: [PATCH] Fix instructions for squashing

`git merge-base master` does not work, you need
`git merge-base master HEAD` instead.
---
 src/git.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/git.md b/src/git.md
index 5f88235c..633e7d57 100644
--- a/src/git.md
+++ b/src/git.md
@@ -160,7 +160,7 @@ Alternatively, you can sacrifice the commit history like this:
 
 ```
 # squash all the changes into one commit so you only have to worry about conflicts once
-git rebase -i $(git merge-base master)  # and squash all changes along the way
+git rebase -i $(git merge-base master HEAD)  # and squash all changes along the way
 git rebase master
 # fix all merge conflicts
 git rebase --continue