Skip to content

fix: rename collapse commits action to squash commits #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matt2e merged 1 commit into from
Apr 2, 2026
Merged

fix: rename collapse commits action to squash commits #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/staged/src/lib/features/branches/BranchCard.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
Expand Down
8 changes: 4 additions & 4 deletions apps/staged/src/lib/features/branches/BranchCardActionsBar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
onRename?: (branchName: string) => void;
onNoteCreated?: () => void;
onRebaseBranch?: () => void;
onCollapseCommits?: () => void;
onSquashCommits?: () => void;
newCommitDisabled?: boolean;
commitCount?: number;
}
Expand All @@ -81,7 +81,7 @@
onRename,
onNoteCreated,
onRebaseBranch,
onCollapseCommits,
onSquashCommits,
newCommitDisabled = false,
commitCount = 0,
}: Props = $props();
Expand Down Expand Up @@ -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>
Expand Down