Skip to content

Commit 13c438c

Browse files
sync-upstream: Use --autostash to handle uncommitted changes
This makes it possible to use sync-upstream with uncommitted changes. (This is in particular helpful when working on the script itself.) Without this commit, git pull will fail due to the uncommitted changes.
1 parent 1d25608 commit 13c438c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/sync-upstream.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ echo "$BODY"
9797
echo "-----------------------------------"
9898
# Create branch from PR commit and create PR
9999
git checkout master
100-
git pull
100+
git pull --autostash
101101
git checkout -b temp-merge-"$PRNUM"
102102

103103
# Escape single quote

0 commit comments

Comments
 (0)