# Fork

> Git client for Mac with visual interactive rebase, a merge conflict resolver, image diffs and blame

Source: https://optioncmd.com/fork
Website: https://git-fork.com/?utm_source=optioncmd
Pricing: One-time purchase
Categories: [Developer tools](https://optioncmd.com/categories/developer-tools.md)
Listed: 2026-10-24
Updated: 2026-10-24

Fork is a Git client for Mac and Windows made by a small family team. It gives you a clear view of your repository and visual tools for everyday and advanced Git tasks.

**Key features:**

- Resolve merge conflicts with the built-in merge conflict helper and resolver.
- Edit, reorder, and squash commits with visual interactive rebase.
- Compare common image formats with image diffs.
- Browse file history, blame, and the repository tree at any commit.
- Stage and unstage changes line by line.
- Restore lost commits with reflog, and work with Git-flow, Git LFS, submodules, and stashes.

Fork costs $59.99 with a free evaluation, and the site lists OS X 10.11 or later as the requirement.

## More developer tools

- [Cursor](https://optioncmd.com/cursor.md): AI coding app with agents that plan, write and test code, plus a CLI and cloud agents
- [Ghostty](https://optioncmd.com/ghostty.md): Fast, cross-platform terminal emulator with platform-native UI and GPU acceleration
- [ForkLift](https://optioncmd.com/forklift.md): Dual-pane file manager and file transfer client for SFTP, S3, cloud drives and more
- [iTerm2](https://optioncmd.com/iterm2.md): Free, open source Terminal replacement for macOS developers and power users
- [Visual Studio Code](https://optioncmd.com/visual-studio-code.md): Free, open source code editor from Microsoft with built-in AI coding agents
- [Transmit](https://optioncmd.com/transmit.md): File transfer app for FTP, SFTP, WebDAV, S3 and cloud services, with sync
- [Tower](https://optioncmd.com/tower.md): Git client for Mac with drag and drop, undo, interactive rebase, stacked branches and pull requests
- [OrbStack](https://optioncmd.com/orbstack.md): Fast, lightweight Docker Desktop alternative for running containers and Linux machines
- [Zed](https://optioncmd.com/zed.md): Fast open-source code editor with multiplayer collaboration and optional AI agents and edit predictions
- [Proxyman](https://optioncmd.com/proxyman.md): Native HTTP(S) debugging proxy for capturing, inspecting and mocking network traffic