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;