From 90c92809c37bd6f19328fde881c49d512ed4963b Mon Sep 17 00:00:00 2001 From: Actaeus Curabitur Date: Thu, 8 Sep 2022 08:38:01 -0500 Subject: [PATCH] fixed squash --- squash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/squash.sh b/squash.sh index 51c9d09..87eb10e 100644 --- a/squash.sh +++ b/squash.sh @@ -7,7 +7,7 @@ git reset --hard qual; git push --force; #merge to master -git checkout -B prod origin/master; +git checkout -B prod origin/prod; git merge --squash qual; git commit -am "$cm"; git push;