From 36c7db988198c0e5149549b98052f73ee313da8e Mon Sep 17 00:00:00 2001 From: George Harley Date: Wed, 17 Jan 2024 10:13:39 +0000 Subject: [PATCH] chore(NO-JIRA): enforce rebase when pulling private branch * removes dependence on user's Git config --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fb9cd93..ea835ea 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ init: git remote add private git@github.com: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 \ No newline at end of file + git reset --hard && git checkout master && git push -d origin car-api && git branch -D car-api