Merge pull request #14 from eeveebank/update-makefile

Enforce rebase when pulling private branch
eeveebank · Jan 23, 2024 · 51c7e4d · 51c7e4d
2 parents 3b657c4 + 36c7db9
commit 51c7e4d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ init:
 	git remote add private [email protected]:eeveebank/remote-pair-programming-test-private
 
 push-test:
-	git checkout -b car-api && git pull private car-api && git push origin car-api
+	git checkout -b car-api && git pull private car-api --rebase && git push origin car-api
 
 delete-test:
-	git reset --hard && git checkout master && git push -d origin car-api && git branch -D car-api
+	git reset --hard && git checkout master && git push -d origin car-api && git branch -D car-api