From 7ebcf6e2d2505aadc89f517d2b84c99194ec09d9 Mon Sep 17 00:00:00 2001
From: Jan Andrle <andrle.jan@centrum.cz>
Date: Sat, 6 Jul 2024 20:05:05 +0200
Subject: [PATCH] :bug: :tv: pull --rebase before commit

---
 cli.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli.mjs b/cli.mjs
index a67907d..9db102e 100755
--- a/cli.mjs
+++ b/cli.mjs
@@ -32,7 +32,7 @@ $.api()
 .command("pull", "Update article list")
 .option("--git", "Update git repository")
 .action(async function pull({ git: is_git= false }){
-	if(is_git) s.run`git pull --force`;
+	if(is_git) s.run`git pull --rebase`;
 	const { changed }= await sitemap().then(toRSS);
 	echo("Changed files:", changed.length ? changed.join(", ") : "—");
 	if(is_git) gitCommit(changed, "pull");