What your Git client should already do.
Mergepond has the history, staging, rebase and conflict tools you expect. These are the parts we built it for.
Everything you do in Git every day.
The everyday work you'd expect from a desktop Git client, with fewer dialogs and an undo for anything destructive.
Find any commit
Search commit messages, and filter the graph by author, path or date. The graph only draws what's on screen, so a repo with 500,000 commits scrolls like a new one.
- Add prorationproration when a plan changes mid-cycle
a3f9c21 - Move invoice totals into a pure function
7be0d14 - Retry the upload test with backoff
c41e8ea - Test prorationproration on annual plans
58d02ab - Handle Paddle subscription webhooks
2fe6b98
5 of 1,284 commits- Add prorationproration when a plan changes mid-cycle
Stage exactly what you mean to
Stage a whole file, one hunk or a single line. Amend, use commit templates, and sign commits with GPG or SSH keys.
Rebase by dragging
Reorder commits, squash them, or drop a fix onto the commit it belongs to. Edit any message in place.
- pick
a3f9c21Add proration when a plan changes mid-cycle⋮⋮ - pick
7be0d14Move invoice totals into a pure function⋮⋮ - pick
4c1d9e2Fix a typo in the proration comment⋮⋮ - pick
2fe6b98Handle Paddle subscription webhooks⋮⋮
Drag a commit to reorder it. Drop it on another to fix it up.- pick
Resolve conflicts one hunk at a time
See your side and theirs next to each other, then keep one, the other or both. The result updates as you choose.
Yours, feat/billing-v2
import { Money } from "../money";Theirs, main
import { daysBetween } from "./days";Result Conflict resolved
Choose a side above, or keep both.Diffs the way you read them
Side by side or inline, with word-level highlights and image diffs.
The rest of Git, too
Blame, file history, stashes, tags, submodules and Git LFS.
Pull requests from your Git host
Sign in to GitHub, GitLab, Bitbucket or Gitea to clone, list pull requests and check one out.
Set it up once, then stop thinking about it.
New worktree
- Copy
.envfiles - Link
node_modules - Run
pnpm install
Worktrees that set themselves up
Create one from a branch or pull request. Mergepond picks the folder, copies your .env files, links node_modules and runs your install command.
Committing as Riley Webb <riley.home@example.com>
This repo is in the Acme workspace, which commits as riley@acme.dev.
Commits with the right name on them
Each workspace has a Git identity, and one identity can serve many workspaces. Mergepond warns you before you commit as the wrong one.
Your code stays on your machines.
- No cloud copy of your repos.Mergepond talks to your Git hosts and your SSH machines. Nothing else sees your code.
- Usage stats stay off until you turn them on.When they're on, they never include repo names, file paths, branch names or code.
- The remote helper is open source.It runs as your SSH user and opens no ports.
Free for local repos. Pay once for the rest.
Free
For repos on your Mac
Pro
Updates for life, new features for a year
Pro is free for students and active open-source maintainers.