AWS CodeCommit
Managed source control service for hosting private Git repositories securely in AWS
GitButler
Work on multiple Git branches simultaneously, no context switching
Git client enabling parallel work across multiple branches in one working directory. Organize uncommitted changes into virtual branches and push them independently without traditional context switching.
Overview
Modern Git Workflow Management
GitButler reimagines branch management by letting developers work on multiple branches simultaneously within a single working directory. Unlike traditional Git workflows that require full context switches between branches, GitButler tracks uncommitted changes in a layer above Git, allowing you to organize file changes—or even parts of files—into separate virtual branches while keeping them all applied to your workspace.
How It Works
The tool maintains awareness of changes before they're committed, recording which virtual branch each diff belongs to. This means you can efficiently multitask across branches, grouping changes dynamically and pushing branches individually to remotes or creating pull requests directly. Virtual branches can be applied or unapplied from your working directory at any time without losing context.
Built for Modern Development
GitButler serves as a more flexible alternative to git add -p and git rebase -i, designed for developers who juggle multiple features, bug fixes, or experiments concurrently. Available for macOS, Linux, and Windows, it brings a fundamentally different approach to branch management that eliminates the friction of constant branch switching.
Highlights
Virtual branches that coexist in a single working directory without context switching
Granular change organization—group file changes or individual diffs into separate branches
Push branches independently to remotes or create pull requests directly from the client
Change tracking layer above Git preserves branch separation while maintaining workspace flexibility
Pros
- Eliminates time lost to branch switching and stashing in traditional Git workflows
- Enables true parallel development across multiple features or fixes simultaneously
- Granular control over uncommitted changes at the diff level, not just file level
- Native desktop applications for macOS, Linux, and Windows with active development
Considerations
- Introduces a conceptual layer above Git that requires learning a new mental model
- Virtual branch approach may not align with team workflows built around traditional Git practices
- Relatively new tool with evolving feature set and potential stability considerations
- Requires desktop application installation rather than CLI-only workflow integration
Managed products teams compare with
When teams consider GitButler, these hosted platforms usually appear on the same shortlist.
Looking for a hosted option? These are the services engineering teams benchmark against before choosing open source.
Fit guide
Great for
- Developers frequently juggling multiple features, bug fixes, or experimental changes
- Teams seeking to reduce context-switching overhead in fast-paced development cycles
- Engineers who need finer-grained control than git add -p for organizing commits
- Projects where parallel branch work and rapid iteration are common workflows
Not ideal when
- Teams with strict workflows requiring traditional Git branch discipline and tooling
- Developers preferring pure command-line Git workflows without GUI dependencies
- Projects where all team members must use identical version control tooling
- Environments requiring fully mature, long-established tooling with extensive plugin ecosystems
How teams use it
Parallel Feature Development
Work on multiple features simultaneously without stashing or switching branches, organizing changes into virtual branches and pushing each when ready.
Hotfix During Feature Work
Address urgent bugs while keeping feature work applied in your workspace—separate the fix into its own virtual branch and push immediately without disrupting ongoing development.
Granular Commit Organization
Split uncommitted changes across files or within individual files into logical branches for cleaner pull requests and more focused code reviews.
Experimental Code Management
Test multiple approaches to a problem in parallel, keeping each experiment in a separate virtual branch that can be applied or unapplied without losing work.
Tech snapshot
Rust56%
TypeScript22%
Svelte21%
CSS1%
Shell1%
JavaScript1%
Frequently asked questions
How do virtual branches differ from regular Git branches?
Virtual branches allow multiple branches to coexist in your working directory simultaneously, whereas traditional Git branches require full context switches. GitButler tracks which changes belong to which virtual branch before they're committed.
Does GitButler replace Git or modify my repository?
GitButler works as a layer on top of Git and does not replace it. Your repository remains a standard Git repository, and you can use other Git clients alongside GitButler.
Can I push virtual branches to remote repositories?
Yes, you can push virtual branches individually to remotes or create pull requests directly from GitButler. Each virtual branch can be managed independently.
What platforms does GitButler support?
GitButler is available as a desktop application for macOS (Apple Silicon and Intel), Linux (AppImage and deb packages), and Windows (msi installer).
Can I organize changes at a more granular level than entire files?
Yes, GitButler allows you to group individual diffs or parts of files into separate virtual branches, providing finer control than traditional staging.
Project at a glance
Active- Stars
- 17,523
- Watchers
- 17,523
- Forks
- 761
Repo age2 years old
Last commit3 hours ago
Primary languageRust
Last synced 3 hours ago