diff --git a/setup-branch.sh b/setup-branch.sh index 6b6efb2..d58cf01 100755 --- a/setup-branch.sh +++ b/setup-branch.sh @@ -13,6 +13,6 @@ fi git merge --squash --strategy-option=theirs --allow-unrelated-histories $work_branch if [ -n "$stash_ref" ] then - git stash pop "$stash_ref" + git stash apply $stash_ref fi git reset HEAD -- .