What both do
| Feature | Mergepond | GitButler |
|---|---|---|
| Commit graph | YesDraws only the rows on screen; filter by message, author, path and dateDocs | PartialBranch lanes and stacks; a full commit graph is experimental in the new native app (0.23.2)github.com |
| Interactive rebase | YesDrag to reorder; pick, reword, squash, fixup, drop or edit each commitDocs | YesDrag and drop to reorder, squash and split commits; no rebase listdocs.gitbutler.com |
| Merge conflict tool | YesKeep ours, theirs or both for each conflict, then continueDocs | PartialConflicted commits are recorded and fixed in an edit mode; markers are resolved in your own editordocs.gitbutler.com |
| Line and hunk staging | PartialWhole files and single hunks; not single linesDocs | YesHunks and individual lines, assigned to branch lanesblog.gitbutler.com |
| Stashes | YesStash, apply, pop and drop, with undo for drop and popDocs | PartialNo stash list; unapplying a branch sets its changes asidedocs.gitbutler.com |
| Git LFS | PartialShows whether a repo uses LFS and pulls LFS filesDocs | PartialWorks in LFS repositories; no LFS management documentedgithub.com |
| Submodules | PartialLists submodules and their state, and updates themDocs | PartialShows submodule pointer changes only; cannot open a submodule as a project (open issue)github.com |
| Worktrees | YesFrom a branch or pull request, with setup steps; safe cleanupDocs | YesNew in 0.23: create, list, archive and remove via the CLI; linked worktrees shown as lanes in the appdocs.gitbutler.com |
| Per-project Git identities | YesOne per workspace, with a warning before a commit as the wrong oneDocs | PartialSeveral GitHub accounts, chosen per project; commit identity comes from Git configdocs.gitbutler.com |
| Coding-agent worktree board | YesPro. Worktrees by state: working, ready for review, merged or goneDocs | PartialAgents tab runs Claude Code sessions tied to parallel branches in one folder, not worktrees; current docs focus on agents using the CLIblog.gitbutler.com |
| Coding-agent plugin (MCP and CLI) | YesFree. pond: an MCP server and CLI, with a Claude Code plugin; agents create and mark worktreesDocs | YesThe but CLI with an official skill and `but agent setup` for Claude Code, Codex, Cursor and othersdocs.gitbutler.com |
| Command palette | Yes⌘K for every command; ⌘P to switch reposDocs | PartialCommand palette in the experimental native app; command mode in the terminal UIgithub.com |
| Pull requests | PartialChecks a pull request out into its own worktree by numberDocs | YesCreate and track GitHub PRs (including stacked PRs) and GitLab MRs; Bitbucket via the CLIdocs.gitbutler.com |
What only Mergepond does
| Feature | Mergepond | GitButler |
|---|---|---|
| Blame | YesBlame and file history in one sheetDocs | UnknownNot found on GitButler’s own site or docs. |
| Repos on another machine over SSH | YesPro. Repos on Linux or macOS hosts you reach over SSHDocs | UnknownNot found on GitButler’s own site or docs. |
What only GitButler does
- Runs on Windows and Linux as well as macOS. gitbutler.com
- Parallel and stacked branches: several branches applied in one working directory. docs.gitbutler.com
- Undo nearly any operation through an operations history. docs.gitbutler.com
- `but` CLI and terminal UI designed for coding agents, with setup for Claude Code, Codex, Cursor and others. docs.gitbutler.com
Where GitButler goes further
- Line and hunk staging. GitButler: Hunks and individual lines, assigned to branch lanes. blog.gitbutler.comMergepond: Whole files and single hunks; not single lines.
- Pull requests. GitButler: Create and track GitHub PRs (including stacked PRs) and GitLab MRs; Bitbucket via the CLI. docs.gitbutler.comMergepond: Checks a pull request out into its own worktree by number.
Price, licence and platforms
| Item | Mergepond | GitButler |
|---|---|---|
| Price | Free for repos on your MacPro is US$49.99 once: repos over SSH, unlimited workspaces and the worktree board, updates for life and new features released in your first year.Pricing | Freegitbutler.com |
| Licence | Proprietary.Docs | Fair source: Functional Source License 1.1 (FSL-1.1-MIT); source available, no competing use, each version becomes MIT after two yearsgithub.com |
| Platforms | macOS 13 or later, Apple silicon and Intel.Mac only for now. Windows and Linux are coming soon. | macOS, Windows, Linuxgitbutler.com |
Switching from GitButler
GitButler applies several branches at once in one folder. Mergepond works with one branch per folder and gives each other branch its own worktree, so decide which branch the main folder should be on before you open it in Mergepond.