Developer preview · A Git client for professional developers
See every change clearly.
Then commit with confidence.
Fox Git is a modern Git client for code review, worktree-based parallel work, and change management in the AI era. IDEA-style three-way conflict merging, first-class file viewing with blame, and line-level staging — powered by your system Git, so it behaves exactly like the command line.
- Linked three-way merge
- Inline blame and range history
- Hunk and line staging
- Powered by system Git
Conflict resolution workbench
Merge conflicts, with all three sides in one view.
Stop hunting through conflict markers. Fox Git puts Ours, Result, and Theirs side by side in one Monaco workbench. Decide hunk by hunk, stage after validation, then continue the merge, rebase, or cherry-pick from the banner.
Read the conflict resolution guideLinked scrolling
Segment mapping centered on Result keeps all three panes in sync without jitter. Turn linking off whenever you like.
Hunk connector bands
Bands tie each side's hunks to the result. Only the visible range is drawn, so long files stay smooth.
Hunk-by-hunk choices
Accept ours, theirs, both, or keep base for each conflict, with progress shown as you go. The result stays editable.
Validate before staging
Leftover conflict markers are checked before a file is marked resolved. Binary and modify/delete conflicts switch to whole-file choices.
File view
Make viewing files a first-class feature.
Fox Git opens files read-only and keeps blame, file history, and range history at hand: who changed this line, when, and why — at a glance.
- Inline blame The end of the cursor line shows the author, time, and commit summary. Hover for details.
- Blame gutter Colored by commit, scrolls with the code, and renders only visible lines. Click to reveal the commit in the graph.
- Hover card The full commit message and a copyable SHA, with one-click access to the change, line history, or the graph.
- Range history Select some code and follow where it lives in every commit, across moves and renames.
Everyday workflow
Replace your everyday Git client.
Committing, history, sync, and stashing get the same care. Everything below is available in the developer preview.
Precise commits
Conflicts, Staged, Unstaged, and Untracked groups. Stage, unstage, or discard whole files, hunks, or selected lines, and amend when committing.
hunk · line · amendHistory graph
A linear commit list with branch lanes. Right-click to check out, cherry-pick, revert, reset, merge, or tag — or drag to cherry-pick, rebase, and merge.
graph · drag & drop · ⌘FQuick Switcher
⌘P searches files, changes, commits, branches, and repositories in one place; ⌘⇧P searches commands only. Fuzzy matching highlights every hit.
⌘P · ⌘⇧P · > # @ /State-aware sync
Pull previews both sides' commits and overlapping files, and lets you choose rebase or merge when branches diverge. Branches without an upstream are published. Force Push with Lease lists the remote commits you would lose first.
fetch · pull · push · leaseStashes
Browse stashed files and diffs. Stash everything, unstaged only, or including untracked files. Apply, pop, drop, or create a branch from a stash.
stash · apply · popLook before you act
Operations that can lose data — reset, discard, branch deletion — list what they affect before you confirm. Clone and push authentication prompts go through system Git and nothing you type is stored.
confirm · GIT_ASKPASS
Coming soonOn the way
See the full roadmap- Interactive rebaseEdit pick, reword, squash, fixup, and drop sequences visually.
- Worktree managementWorktrees as first-class citizens: create, remove, and prune, and switch between parallel tasks.
- AI review and commit messagesReview your current changes or a commit and draft commit messages. AI output is always a draft until you confirm it.
- PR / MR review loopGitHub and GitLab, including self-managed: lists, diffs, inline comments, and local drafts.
- Built-in terminalOpens at the current repository or worktree root, with multiple terminal tabs.
Why Fox Git
Not just another Git GUI.
Basic Git GUIs are already usable. Fox Git invests where judgment matters most: merging conflicts and reading files.
| Capability | Fox Git | Typical Git GUI |
|---|---|---|
| Merge conflicts | Built-in linked three-way workbench, hunk-by-hunk choices, validated staging | Usually conflict markers or an external merge tool |
| Blame and history | Inline blame, hover cards, and range history | Usually a separate blame view; range history often needs an IDE |
| Commit granularity | Stage and discard files, hunks, or selected lines | Support varies |
| Code browsing | Read-only by default to prevent accidental edits; editing is explicit | Usually handed off to an external editor |
| Git behavior | Runs your system Git (2.36+), identical to the command line | Some products use a built-in Git implementation |
| Platforms | Consistent on macOS, Windows, and Linux | Some products do not support Linux |
| Review in the AI era | Coming soon: AI review drafts and the PR / MR loop | Mostly AI-generated commit messages |
“Typical Git GUI” is a general description; actual capabilities vary by product and version.
Principles
Correctness first, without compromising the experience.
Powered by system Git
Every operation runs your local Git, so your config, hooks, and credential helpers just work, and results match the command line.
Read-only by default
Browsing, diffs, and history never write files. Only explicit flows such as conflict resolution modify your working tree.
Local first
Repositories and code are processed only on your computer. Fox Git does not host your code and needs no account.
Consistent everywhere
Linux is a first-class citizen. macOS, Windows, and Linux share the same workbench and shortcut system.
Pricing
One license for the whole workbench.
Fox Git is commercially licensed as a monthly or yearly subscription, paid through the secure Waffo checkout. Prices and device allowances follow the live quote on the pricing page.
View pricing- No account needed — activate with a key
- Devices bound within your plan's allowance
- Updates included while your license is valid
- No-questions-asked refund within 14 days of first purchase
- Look up an existing license
FAQ
Things you may want to know first
The docs have more detail. Still have questions? Email us.
Browse the docsHow is Fox Git different from Fork, SourceTree, or GitKraken?
Fox Git focuses on two things: IDEA-style linked three-way conflict merging, and read-only file viewing with inline blame and range history. Everyday commits, the history graph, sync, and stashes are all there too, with worktree management, AI review, and the PR / MR review loop coming next.
Do I need to install Git separately?
Yes. Fox Git runs your system Git and requires version 2.36 or later, so your config, hooks, and credential helpers keep working.
Which operating systems are supported?
Fox Git is designed for macOS, Windows, and Linux. It is currently in developer preview; installers for each platform will be published on the download page with the public release.
Does Fox Git upload my code?
No. Git operations run on your machine, and Fox Git neither hosts nor collects your repository contents. License checks send only the license key, an irreversible device digest, the device name, and the platform.
When will AI review arrive?
AI review and AI commit messages are planned for milestone M3. The principle: AI output is a draft by default, used or published only after you confirm it, and it cites specific files, hunks, and lines.
Do you support GitHub and self-managed GitLab?
Git operations such as push and pull work with any remote. Review integration — PR / MR lists, inline comments, and drafts — is planned for milestone M4, starting with GitHub and GitLab, including self-managed.
How do I buy and activate?
Choose monthly or yearly billing on the pricing page and pay through the Waffo checkout — no account needed. After payment is confirmed, claim your license key on the result page. You can check its status and manage devices on the license lookup page at any time.
Download
Try Fox Git on your system.
Fox Git targets macOS, Windows, and Linux. Version information comes straight from the release service, and downloads appear here once released publicly.
Checking for the latest version…
- macOS · Apple siliconDMG installer
- macOS · IntelDMG installer
- Windows · x64Installer
- Linux · x64AppImage · DEB · RPM
Requires Git 2.36 or later