From 480dde74bcce2314f3023ffc61afc65e4673cb24 Mon Sep 17 00:00:00 2001
From: Matt Toohey <contact@matttoohey.com>
Date: Thu, 2 Apr 2026 09:23:10 +1100
Subject: [PATCH] fix: rename collapse commits action to squash

---
 apps/staged/src/lib/features/branches/BranchCard.svelte   | 4 ++--
 .../src/lib/features/branches/BranchCardActionsBar.svelte | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/staged/src/lib/features/branches/BranchCard.svelte b/apps/staged/src/lib/features/branches/BranchCard.svelte
index 25869cfcc..ada1d9471 100644
--- a/apps/staged/src/lib/features/branches/BranchCard.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCard.svelte
@@ -814,8 +814,8 @@
           onNoteCreated={() => loadTimeline()}
           onRebaseBranch={() =>
             sessionMgr.startOrQueueSession('commit', 'Rebase this branch. Do not push the branch.')}
-          onCollapseCommits={() =>
-            sessionMgr.startOrQueueSession('commit', "Collapse this branch's commits")}
+          onSquashCommits={() =>
+            sessionMgr.startOrQueueSession('commit', "Squash this branch's commits")}
           newCommitDisabled={sessionMgr.isNewSessionDisabled}
           {commitCount}
         />
diff --git a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
index 00304a60e..08da7e202 100644
--- a/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
+++ b/apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
@@ -66,7 +66,7 @@
     onRename?: (branchName: string) => void;
     onNoteCreated?: () => void;
     onRebaseBranch?: () => void;
-    onCollapseCommits?: () => void;
+    onSquashCommits?: () => void;
     newCommitDisabled?: boolean;
     commitCount?: number;
   }
@@ -81,7 +81,7 @@
     onRename,
     onNoteCreated,
     onRebaseBranch,
-    onCollapseCommits,
+    onSquashCommits,
     newCommitDisabled = false,
     commitCount = 0,
   }: Props = $props();
@@ -867,11 +867,11 @@
           disabled={newCommitDisabled}
           onclick={() => {
             showMoreMenu = false;
-            onCollapseCommits?.();
+            onSquashCommits?.();
           }}
         >
           <GitBranch size={14} />
-          Collapse Commits
+          Squash Commits
         </button>
       {/if}
       <div class="menu-separator"></div>