diff --git a/scripts/git.sh b/scripts/git.sh index 4b7245d..51ccebb 100755 --- a/scripts/git.sh +++ b/scripts/git.sh @@ -29,7 +29,6 @@ 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 true git config --global pull.twohead ort git config --global push.autoSetupRemote true git config --global rebase.stat true