We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 1791670 commit aa2a1d4Copy full SHA for aa2a1d4
1 file changed
unstable-build.sh
@@ -74,7 +74,7 @@ trap cleanup EXIT
74
75
echo "==> Building from upstream ${UNSTABLE_NAME} with Zaparoo ${FORK_SHORT_SHA}"
76
git worktree add --detach "${TMP_WORKTREE}" "${UNSTABLE_COMMIT}" >/dev/null
77
-git -C "${TMP_WORKTREE}" merge --no-edit -Xignore-all-space "${FORK_HEAD}"
+git -C "${TMP_WORKTREE}" merge --no-commit --no-ff -Xignore-all-space "${FORK_HEAD}"
78
79
"${TMP_WORKTREE}/docker-build.sh" "$@"
80
0 commit comments