Git stash apply

amousavigourabi · Aug 17, 2023 · 1d48cd8 · 1d48cd8
1 parent f660d57
commit 1d48cd8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 -- .