From d9c5ff21cfd8ec27b99000b5383d97d3eb2f1329 Mon Sep 17 00:00:00 2001
From: iff <iff@ik.me>
Date: Sat, 28 Jun 2025 15:40:42 +0200
Subject: [PATCH] fix: `git pull` has no `--merge` option

---
 rules/git.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/git.toml b/rules/git.toml
index c350cc3..a4c9f96 100644
--- a/rules/git.toml
+++ b/rules/git.toml
@@ -151,5 +151,5 @@ suggest = [
 {{command}} --rebase ''',
 '''
 #[cmd_contains(pull)]
-{{command}} --merge '''
+{{command}} --no-rebase '''
 ]