From 1d48cd81da7f230cbe94105865d415c270c10859 Mon Sep 17 00:00:00 2001
From: amousavigourabi <28668597+amousavigourabi@users.noreply.github.com>
Date: Thu, 17 Aug 2023 04:43:49 +0200
Subject: [PATCH] Git stash apply

---
 setup-branch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 -- .