Repository navigation
Collate 1.3.0
Changes since v1.2.1
- Remove the plan (e9dd44e)
- Undo the last operation that moved HEAD with ⌘Z, the notice's Undo or the branch menu: commits, amends, merges, rebases, pulls, resets, cherry-picks, reverts and switches; a hard reset saves the working tree first so its undo puts the changes back (5ac801d)
- Fix up an earlier commit with what's staged, from its menu in History: committed as a fixup and rebased in, unstaged changes set aside meanwhile; undoable (35ab87b)
- A minimap down the diff's right edge: removed and added lines, file starts and search matches, with a box over the part on screen that follows the scroll; click or drag it to go there. On by default, in Settings (bbeadfd)
- A merge editor for conflicted files: changes only one side made merge by themselves, and each conflict shows ours, the base and theirs side by side to take a side, both, neither, or line by line; n and p move between conflicts, 1 2 3 take a side. Saving writes the file and marks it resolved (febf25a)
- Compare outside a repository: collate a b for two files or folders, a patch file or git diff | collate, and --merge for git mergetool; flags for the view, layout, a commit or range and a path filter; dropped folders, patches and pairs of files; Settings makes Collate git's difftool and mergetool (45aa1df)
- Inline blame beside the line numbers (b, or More): who last changed each line and when, said where the commit changes, with the summary on hover; as of the commit in History, the index for staged changes, else the working tree (e7b63f9)
- Checks' annotations under their lines in a pull request: each lint, warning or failure a check run left on the head shows under its line, coloured by level, while the diff is the whole pull request (84fcd23)
- Remove the minimap (8455f67)
- Themes: Tokyo Night, Paper, Catppuccin, Dracula, GitHub Dark, Gruvbox, Monokai, Nord, One Dark, Rosé Pine and Solarized beside System, Light and Dark, each from its published colours down to the diff's tints and the code's tokens; Settings - Appearance shows a preview of each to pick from (a886d9d)
- Settings - Theme is a dropdown with a preview of the chosen theme under it, in place of a grid of every theme (1483b97)
- Ask the agent (i, or Ask in the sidebar's Agent section): a question about the selected lines, or the change in view when none are, runs in a new terminal with a checkpoint to go back to; each agent row says what it starts (bd9599a)
- Dialogs - a long description wraps inside the dialog instead of running past its edge and taking the close button with it, and the body lines up with the title (5cdc6e0)
- Settings - a dropdown's menu opens under it, as wide as it, not at the window's corner; a setting with more than three choices is a dropdown instead of a row of tabs (6c7a15d)
- Settings - Languages are pills: installed ones solid, with an × to remove and a refresh when outdated; the rest dashed with a +, installed on a click (bbac271)
- The diff keeps its scroll when the status bar comes or goes (9ee4243)
- Selected lines get a bar over the diff's foot with Comment, Ask and Copy; Shift-↑↓ selects lines from the keyboard, and text dragged across the code selects its lines (ac0d06d)
- Stage All's ⌄: Unstage All, Stash All, Stash Tracked, Stash Pop, View Stash, and Discard Tracked Changes or Remove Untracked Files, which ask first and back the files up for Undo (2a73cb6)
- A file's menu stashes that file alone, or ignores an untracked one in .gitignore (8e56625)
- A copy button after each file header's path, with a check while the notice says it's copied (901436d)
- Pull, Rebasing My Commits: a branch that moved on both sides pulls with its own commits replayed on top (dbf5868)
- The first push of a branch without an upstream goes to the only remote, not origin alone, and says what to do when there are several (60b0107)
- Edit Message in a commit's menu rewords one on this branch, keeping its body; ⌘Z undoes it (2e8fcb0)
- With nothing staged, Write with the agent becomes Stage All and Write instead of sitting disabled (ca0b4c2)
- A menu bar: File, View, Go, Changes, Branch, Agent and Help name every command with its key, checked and greyed as the review stands, from one list in commands.rs (cc59bb8)
- Right-click menus: a diff line (stage, discard, comment, ask, copy, open, blame, each with its key), a file's header or list row, a Git Graph commit, and a project (44c0337)
- Keys that do nothing in a view say why: a in Staged or Branch, u with nothing staged, x on staged changes, < > outside History, p on a commit (b4b6646)
- The shortcuts sheet (?) is in sections and searches as you type; it adds Back and Forward, History's Return and Escape, and right-click, and the README's key table lists i, y, the panels and History's keys (39e6d8f)
- Tooltips show their keys the same way: buttons through .shortcut(), other controls through help_keys, and the sidebar's views, the layout control and the viewed check gain theirs (2066bfc)
- A command palette (⇧⌘P) finds and runs any command that can run now by name, with its menu and key beside it (91d3da2)
- The branch menu keeps to syncing, branches and the pull request: stashes and tags open from Branch > Stashes… and Tags… (and the palette), the stash list joins Stage All's ⌄ menu, and its duplicate Stash All goes (2c17dc4)
- An empty view offers somewhere else to look (the Git Graph, Pull Requests, Compare, the other views, Commit), each with its key, and the welcome says a dropped folder, a pair of files or a patch opens too (fcf2b52)
- Greyed controls say why: Inline Blame in Split or without a repository, Rebase with changes, Continue with conflicts left, Amend with no commit, picked-words buttons, Compare, Back and Forward, Older and Newer, the terminal with no project (158db54)
- Tools that lived only in Settings show where they're used: Help gains Check for Updates… and Use Collate for git difftool and mergetool (so the palette finds them), and the pull request preview offers Compare Others… beside its base (ff46f08)
- Start and refresh are faster: git runs without the xcrun shim (5 ms a call), a snapshot reads blobs, attributes and working files at once, files are diffed from a shared queue and from two files on, and line interning hashes with rustc-hash (b41e94e)
- The terminal's wheel reaches a program that asked for the mouse (the agent, htop, vim with mouse=a) as xterm's wheel reports, in SGR, UTF-8 or the old form, instead of arrow keys that paged through the agent's prompt history (780a2e7)
- Swap Sidebars (View menu and Settings > Appearance) puts the staging panel on the left and the views on the right, each keeping its width, and the toolbar's panel button toggles whichever trails (9d80634)
- The selection bar's buttons take a click: a press on the bar keeps the code's text selection, which had cleared the lines and the bar before the press let go, and its close button clears both (00ac7f7)
- The commit box drops its Amend checkbox (Changes > Amend Last Commit stays), and Write the Commit Message works when amending or with changes not yet staged (e08bd58)
- The terminal's text fades in and out on the shortest fade, 0.1 s, instead of the default 0.2 s, which smeared each line of a scroll (b477afa)
- The commit box works as Zed's git panel, and the selection bar's Add to Chat puts the selected lines into the agent's message in the Agent tab instead of asking for a question in a dialog (dc2850b)
- Release 1.3.0 (1360aec)
Install
Install or update with npx collate-app@latest.
Collate-1.3.0-macos-universal.dmg holds the app, for Apple silicon and Intel Macs,
macOS 13 or later; it needs git on your PATH. Open it and drag Collate to
Applications. Collate-1.3.0-macos-universal.zip is the same app, for the in-app
updater and the installer. Both are signed with a Developer ID and notarized by Apple.
The collate-1.3.0-macos-universal.tar.gz download holds the bare binary for a
terminal: collate <repository>. SHA256SUMS lists every download's checksum.
Full changelog: v1.2.1...v1.3.0