From 7d3f5043e18bf3c1a92f2cc0ff424a8e577ae383 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 11 May 2020 11:41:33 -0700
Subject: [PATCH] build: fix assumed aliases in rebase-pr script (#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 #37050
---
 scripts/github/rebase-pr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/github/rebase-pr b/scripts/github/rebase-pr
index b87dbe815f..0ac67dfa92 100755
--- a/scripts/github/rebase-pr
+++ b/scripts/github/rebase-pr
@@ -29,9 +29,9 @@ echo Rebasing $USER_GIT_URL branch $BRANCH onto $REBASE_ON
 echo =====================================================
 
 git fetch $USER_GIT_URL $BRANCH
-git co FETCH_HEAD
+git checkout FETCH_HEAD
 PUSH_CMD="git push $USER_GIT_URL HEAD:$BRANCH -f";
-RESTORE_CMD="git co $OLD_BRANCH"
+RESTORE_CMD="git checkout $OLD_BRANCH"
 git rebase upstream/master
 if [ $? -eq 0 ]; then
     $PUSH_CMD