Skip to content

Commit 7d3f504

Browse files
josephperrottmhevery
authored andcommitted
build: fix assumed aliases in rebase-pr script (angular#37050)
The local rebase-pr script assumes the existence of specific git aliases. Instead this script should rely on the full written out command instead. PR Close angular#37050
1 parent 14c0ec9 commit 7d3f504

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/github/rebase-pr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ echo Rebasing $USER_GIT_URL branch $BRANCH onto $REBASE_ON
2929
echo =====================================================
3030

3131
git fetch $USER_GIT_URL $BRANCH
32-
git co FETCH_HEAD
32+
git checkout FETCH_HEAD
3333
PUSH_CMD="git push $USER_GIT_URL HEAD:$BRANCH -f";
34-
RESTORE_CMD="git co $OLD_BRANCH"
34+
RESTORE_CMD="git checkout $OLD_BRANCH"
3535
git rebase upstream/master
3636
if [ $? -eq 0 ]; then
3737
$PUSH_CMD

0 commit comments

Comments
 (0)