Update commit.tpl.ssh

2 years ago · f69dd139c0
parent ab6f860bde
commit f69dd139c0
1 changed files with 2 additions and 0 deletions
--- 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