Merge and rebase, shown before they run
The operations that join or rewrite history are the ones worth a second look. In gitā each one opens a sheet that says what is about to happen.
Try it live
Mira Okafor mira@northpier.example
4m ago · feature/checkout-v2Apply the saved address when the cart reloads
The payment step read the address from the form state, so a reload lost it. Read it from the cart instead.
Written with Claude CodeNo pull request, checks or deployments
Merge · feature/checkout-v2
Things to try
Choose a branch in the Merge sheet.
Switch between the three ways to merge.
Right-click a commit in the history for Cherry-pick and Revert.
A sheet first
Merge, rebase, cherry-pick, revert and reset each start with a sheet that names the branch or commit involved. Nothing changes until you confirm.
Three ways to merge
Fast-forward when possible, always create a merge commit, or fast-forward only. Choose your usual one in Settings ▸ Git, where a small animation shows what each does.
Edit commits
Edit Commits After This is an interactive rebase. Set each commit to pick, reword, edit, squash, fixup or drop, drag them into a new order, and gitā checks the plan before it runs.
Continue, skip, abort
While an operation is under way, a bar over the history says how far it has got and how many files are unresolved, with Continue, Skip and Abort.
Conflict editor
A conflicted file opens with the base, the current and the incoming version, and an editable result underneath. Take one side with a button or write the result yourself, then Save & Stage.
Reset, with the count
Reset to a commit keeping staged changes, keeping your files, or discarding tracked changes. The sheet tells you how many files that affects, and a hard reset needs a tick first.
It checks again
Before anything runs, gitā makes sure the repository is still on the branch and commit you looked at.
Questions, *answered*
Can I resolve merge conflicts in gitā?
Does gitā support interactive rebase?
Keep exploring
All featuresStaging
Stage a file or a single hunk, and write the commit.
Try it liveBranches and remotes
Check out, create, rename, push and pull, from one menu.
Try it liveWorktrees
Several branches checked out at once, each in its own folder.
Try it liveTerminal
Your shell in the repository's folder, at the bottom of the window.
Try it liveWorkspaces and tabs
Keep each project's repositories together, in tabs you can colour and group.
Try it liveMenu bar panel
What needs you, first. Then your agents, then every workspace.
Try it live