From 551ae0393c65ad559554f875ad3a81605a3cfe32 Mon Sep 17 00:00:00 2001 From: Risto Date: Mon, 4 Jul 2022 15:37:04 +0200 Subject: [PATCH] Removed git config from build env script --- tools/setup_buildenv_msys2_stage2.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/setup_buildenv_msys2_stage2.sh b/tools/setup_buildenv_msys2_stage2.sh index acf7111d5..46f44ef3f 100644 --- a/tools/setup_buildenv_msys2_stage2.sh +++ b/tools/setup_buildenv_msys2_stage2.sh @@ -74,10 +74,4 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." fi -echo "=== Step $((STEP++)): Set git pull by default to rebase instead of merge ===" -git config --bool pull.rebase true -if [[ $PAUSEAFTEREACHLINE == "true" ]]; then - echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." -fi - echo "Setting up build environment has finished. You can now start building EdgeTX firmware and binaries!"