Skip to content

Commit 69a9d92

Browse files
authored
Merge pull request #29 from whoisninjaturtle/develop
2 parents fc39938 + 3b54f07 commit 69a9d92

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ echo "* STAGING *"
138138
echo "************************************"
139139
echo ""
140140
# Create a blank branch to work on
141-
git switch --orphan tatter/scratch
141+
git checkout --orphan tatter/scratch
142+
git rm -rf .
142143

143144
# Bring over just what we need to recreate the framework
144145
git checkout "$BASE" -- .gitignore composer.*
@@ -183,7 +184,7 @@ git commit -m "Patch framework" --no-verify
183184
rm composer.*
184185

185186
# Create the new branch from base
186-
git switch -c tatter/patches "$BASE"
187+
git checkout -b tatter/patches "$BASE"
187188

188189
# Restore the original state of vendor/
189190
composer install --no-scripts > /dev/null

0 commit comments

Comments
 (0)