Change git by default to rebase instead of merge

2022-06-13 14:36:04 +02:00
parent 5d399b05da
commit aee222bd31
1 changed files with 6 additions and 0 deletions
@@ -74,4 +74,10 @@ 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 --global --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!"