Git with a safety cockpit.
FluxGit is a desktop Git client for developers who need visual history, guided risky operations, recovery, Trinity 3-way conflicts, semantic diff surfaces with fallback, Fleet Radar and read-only AI agent inspection.
The real FluxGit interface, on synthetic demo data.
These are real screenshots of the FluxGit desktop app, captured with synthetic demo repositories, branches and commits only — no real customer or local repository data.
Built for the moments Git gets dangerous.
Most Git tools make commit and push easier. FluxGit focuses on the expensive moments: conflicts, rebases, resets, dirty worktrees, lost commits, monorepos, submodules and multi-repo drift.
Planned founder license for early users. Paddle checkout will be enabled after the licensing API and payment provider integration are live.
View founder licenseOne cockpit for the Git work that normally breaks flow.
FluxGit combines a visual Git graph with safety rails, recovery, conflict resolution, semantic diff fallback, optional AI-assisted commit workflows, read-only agent context and local-first privacy controls.
Safety rails
Risk levels, explicit decisions, safer alternatives and contextual recovery before destructive Git operations.
Flux restore points
Recovery-oriented checkpoints for dangerous history operations, designed to make rebase and reset less scary.
Reflog recovery
Turn local HEAD movements into visible rescue actions, including recovery branch creation after reset or branch deletion.
Trinity conflicts
Guided 3-way conflict workspace for base, current, incoming and final result review.
Predictive conflicts
Beta preflight branch integration checks to warn about likely merge conflicts before the user starts a risky operation.
Semantic diffs
Structural diff surfaces for supported files, with explicit fallback to normal Git diffs when semantic analysis is unavailable.
Commit Studio
A larger focused commit surface for staging, reviewing diffs and composing commits without fighting cramped side panels.
Fleet Radar
See which selected local repositories are dirty, behind, ahead, divergent or need attention without opening them one by one.
MCP write-with-UI-handshake
Your AI agent proposes. FluxGit's approval modal shows the diff, risk, restore point. You decide. Five operations: merge, rebase, discard, reset, patch.
AI Cortex
Provider-aware AI-assisted commit workflows when configured, with local-first secret handling and normal Git still usable without AI.
Monorepo tools
Partial clone, sparse checkout, focused branch filtering and performance-conscious repository refresh policies.
Submodules and worktrees
Workspace surfaces for submodules, worktrees and parent-child repository context, with beta hardening in progress.
Designed around real workflows, not isolated commands.
Branch status, remote drift, dirty submodules, reflog hints and Fleet Radar attention signals.
Checkout, discard, rebase, merge, cherry-pick and reset flows explain consequences before continuing.
Reflog recovery, restore points, conflict panels and contextual recovery avoid silent destructive guesses.