Update PR merge script

2 years ago · 5ef4b698cb
parent e0e730f298
commit 5ef4b698cb
1 changed files with 2 additions and 4 deletions
--- a/scripts/squash-merge.sh
+++ b/scripts/squash-merge.sh
@ -2,8 +2,6 @@
 set -e
-git reset --soft HEAD~$(git rev-list --count HEAD ^master)
+current_branch=$(git branch --show-current)
 git checkout master
-git add -A
+gh pr merge "$current_branch" -s -t "$1"
 git commit -m "$1"