Pull with rebase

ostenbom · ostenbom · commit f677b957d835 · 2025-09-10T14:13:13.000+02:00
diff --git a/scripts/utils.ts b/scripts/utils.ts
@@ -85,7 +85,7 @@ export async function pushBranch(): Promise<void> {
 }
 
 export async function pullBranch(): Promise<void> {
-	const proc = Bun.spawn(["git", "pull"], {
+	const proc = Bun.spawn(["git", "pull", "--rebase"], {
 		stdout: "pipe",
 		stderr: "pipe",
 	});
@@ -95,4 +95,4 @@ export async function pullBranch(): Promise<void> {
 		const error = await new Response(proc.stderr).text();
 		throw new Error(`Failed to pull: ${error}`);
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export async function pushBranch(): Promise<void> {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`export async function pullBranch(): Promise<void> {`
`88`		`- const proc = Bun.spawn(["git", "pull"], {`
	`88`	`+ const proc = Bun.spawn(["git", "pull", "--rebase"], {`
`89`	`89`	`stdout: "pipe",`
`90`	`90`	`stderr: "pipe",`
`91`	`91`	`});`
`@@ -95,4 +95,4 @@ export async function pullBranch(): Promise<void> {`
`95`	`95`	`const error = await new Response(proc.stderr).text();`
`96`	`96`	throw new Error(`Failed to pull: ${error}`);
`97`	`97`	`}`
`98`		`-}`
	`98`	`+}`