[git-tool] explicit disable rebase (openthread#10645)

This commit adds `--no-rebase` to `git` command when applying dependencies because recent git versions doesn't have a default rebase strategy anymore.
espressif · Aug 28, 2024 · 706013f · 706013f
1 parent 95a4c33
commit 706013f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/script/git-tool b/script/git-tool
@@ -46,7 +46,7 @@ apply_dependencies()
         echo "${dependency}"
         depends_on_pr="$(echo "${dependency}" | tr -d '\r\n' | cut -d# -f2)"
         echo "pr: #${depends_on_pr}"
-        git pull --no-edit origin "pull/${depends_on_pr}/merge"
+        git pull --no-edit --no-rebase origin "pull/${depends_on_pr}/merge"
     done < <(grep -E "^Depends-On: *${project_name}" || true)
 }