chore(git): disable rebase

haunt98 · Dec 26, 2023 · 40daad4 · 40daad4
1 parent b58d964
commit 40daad4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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