From a1034d2eacdc7b0928e81d2093bf8211a02eb671 Mon Sep 17 00:00:00 2001
From: Xinglin Qiang <xinglinqiang@gmail.com>
Date: Mon, 18 Jan 2021 08:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8rebase=E4=BB=A5=E9=A2=84=E9=98=B2?=
 =?UTF-8?q?=E6=BD=9C=E5=9C=A8=E7=9A=84force=20push?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker_entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker_entrypoint.sh b/docker/docker_entrypoint.sh
index 6fc71550..811b8556 100644
--- a/docker/docker_entrypoint.sh
+++ b/docker/docker_entrypoint.sh
@@ -11,7 +11,7 @@ cd /scripts
 git remote set-url origin $REPO_URL
 git reset --hard
 echo "git pull拉取最新代码..."
-git -C /scripts pull
+git -C /scripts pull --rebase
 echo "npm install 安装最新依赖"
 npm install --prefix /scripts