Skip to content

GitButler ⧓

Ben Forbes Griffith edited this page Feb 11, 2024 · 1 revision

What is 🤵🏻GitButler?

GitButler is a git client that lets you work on multiple branches at the same time. It allows you to quickly organize file changes into separate branches while still having them applied to your working directory. You can then push branches individually to your remote, or directly create pull requests.

In a nutshell, it’s a more flexible version of git add -p and git rebase -i, allowing you to efficiently multitask across branches.


How does it work?

GitButler keeps track of uncommitted changes in a layer on top of Git. Changes to files or parts of files can be grouped into “virtual branches”… Whenever you are happy with the contents of a virtual branch, you can push it to a remote. GitButler makes sure that the state of other virtual branches is kept separate.

How do GitButler’s virtual branches differ from Git branches?

The branches that we know and love in Git are separate universes, and switching between them is a full context switch. GitButler allows you to work with multiple branches in parallel in the same working directory. This effectively means having the content of multiple branches available at the same time!

GitButler is aware of changes before they are committed. This allows it to keep a record of which virtual branch each individual diff belongs to. Effectively, this means that you can separate out individual branches with their content at any time to push them to a remote or to unapply them from your working directory.

Finally, while in Git it’s preferable that you create your desired branch ahead of time, using GitButler you can move changes between virtual branches at any point during development.