From f69dd139c01d74bc9e1a6c2fbbbd3ec88ff4baf7 Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Wed, 30 Nov 2022 15:25:39 +0800
Subject: [PATCH] Update commit.tpl.ssh

---
 plugins/gitea/hook/commit.tpl.ssh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/gitea/hook/commit.tpl.ssh b/plugins/gitea/hook/commit.tpl.ssh
index 6aac78ca8..0602d64f0 100755
--- a/plugins/gitea/hook/commit.tpl.ssh
+++ b/plugins/gitea/hook/commit.tpl.ssh
@@ -15,6 +15,8 @@ if [ ! -d $GIT_PROJECT_DIR ];then
 fi
 
 unset GIT_DIR
+git config pull.rebase false
+
 cd $GIT_PROJECT_DIR && git pull
 
 # func 2