chore(git): disable rebase

2023-12-26 16:10:57 +07:00 · 2023-12-26 16:10:57 +07:00 · 40daad4613
parent b58d9640e0
commit 40daad4613
1 changed files with 1 additions and 0 deletions
--- a/scripts/git.sh
+++ b/scripts/git.sh
@ -29,6 +29,7 @@ git config --global diff.colorMoved no
 git config --global fetch.prune true
 git config --global init.defaultBranch main
 git config --global merge.conflictstyle diff3
+git config --global pull.rebase false
 git config --global pull.twohead ort
 git config --global push.autoSetupRemote true
 git config --global rebase.stat true