From 125d43d226a0a52d80415062e7a8ba28f6f7d9e2 Mon Sep 17 00:00:00 2001
From: zolinthecow <colinzhao777@gmail.com>
Date: Wed, 9 Jul 2025 23:41:17 -0700
Subject: [PATCH] claude-baseline-1752129677

---
 LICENSE.md                |  6 ++++++
 lua/nvim-claude/hooks.lua | 15 ++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index f50b8a24..80a4c5dc 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -29,3 +29,9 @@ AUTOMATIC HOOK TEST: This should trigger hooks automatically!
 RESTART TEST: This edit is after Neovim restart - hooks should work now!
 
 HOOKS FIXED: This edit should trigger the pre/post hooks and show inline diff!
+
+TEST AFTER REBASE: This line should trigger the inline diff automatically!
+
+HOOK TEST: Testing with corrected settings.json!
+
+RESTART COMPLETE: Testing hooks after Neovim restart!
diff --git a/lua/nvim-claude/hooks.lua b/lua/nvim-claude/hooks.lua
index d5719bf5..e6aa41cb 100644
--- a/lua/nvim-claude/hooks.lua
+++ b/lua/nvim-claude/hooks.lua
@@ -510,13 +510,14 @@ function M.cleanup_old_commits()
     end
 
     -- Keep only the last 5 Claude commits, remove the rest
-    if #commits > 5 then
-      for i = 6, #commits do
-        local reset_cmd = string.format('cd "%s" && git rebase --onto %s^ %s', git_root, commits[i], commits[i])
-        utils.exec(reset_cmd)
-      end
-      vim.notify('Cleaned up old Claude commits', vim.log.levels.DEBUG)
-    end
+    -- DISABLED: This was causing rebases that broke the workflow
+    -- if #commits > 5 then
+    --   for i = 6, #commits do
+    --     local reset_cmd = string.format('cd "%s" && git rebase --onto %s^ %s', git_root, commits[i], commits[i])
+    --     utils.exec(reset_cmd)
+    --   end
+    --   vim.notify('Cleaned up old Claude commits', vim.log.levels.DEBUG)
+    -- end
   end
 end