The GitButler version control client, backed by Git, powered by Tauri/Rust/Svelte
Go to file
Sebastian Thiel c30ac3ba62
optimize tokio features
Previously, the attempt was made to enable only those `tokio` features
that are actually used. However, due to default-features still being
enabled and `tauri` using the `full` feature, for most intents and purposes
that wasn't effective.

Now default features are disabled, and `full` isn't used anymore, forcing
all crates to mention the exact features they need.

Note that `tracing` is missing here, as it wasn't effective previously
without the `--cfg tokio_unstable` option also being specified as rustflag.
2024-04-18 09:48:23 +02:00
.cargo re-add cargo config 2024-03-01 17:26:55 +01:00
.github Merge pull request #3528 from gitbutlerapp/clear-artifacts-on-sign 2024-04-16 16:58:04 +02:00
app Merge branch 'master' into always-await-promises 2024-04-17 13:23:31 +01:00
crates optimize tokio features 2024-04-18 09:48:23 +02:00
scripts change normalization to use underscore instead of plus 2024-04-16 17:50:45 +02:00
.editorconfig add .editorconfig 2024-01-17 16:27:47 +01:00
.gitignore ignore .vscode in all cases 2024-03-01 15:30:53 +01:00
Cargo.lock Remove now unused dependencies from tauri. 2024-04-18 09:25:33 +02:00
Cargo.toml optimize tokio features 2024-04-18 09:48:23 +02:00
CODE_OF_CONDUCT.md add a bunch of basic docs that we need for open sourcing this bad boy 2024-01-11 19:52:52 +01:00
CONTRIBUTING.md fix(docs): clean up some typos in documentation files 2024-02-17 18:54:08 +01:00
DEVELOPMENT.md fix gitbutler-app -> gitbutler-tauri broken links 2024-04-04 12:55:08 +02:00
LICENSE.md Upgrade FSL to 1.1 2024-03-12 10:06:43 -04:00
package.json chore: align 'app' and 'lib' crates imports. 2024-03-30 19:48:48 +01:00
pnpm-lock.yaml build(deps): bump the npm-updates group with 12 updates 2024-04-15 15:56:46 +00:00
pnpm-workspace.yaml update config to refer to new crate structure 2024-04-04 12:09:12 +02:00
README.md docs: Add link to Unstable Nightly releases in README (#123) 2024-04-11 10:09:59 +02:00
rust-toolchain.toml update toolchain 2024-04-04 12:20:31 +02:00
rustfmt-nightly.toml chore: align 'app' and 'lib' crates imports. 2024-03-30 19:48:48 +01:00
SECURITY.md add a bunch of basic docs that we need for open sourcing this bad boy 2024-01-11 19:52:52 +01:00

GitButler

Git branch management tool, built from the ground up for modern workflows
gitbutler.com »

Download for macOS (Apple Silicon | Intel) · Linux (AppImage | deb) · Windows (msi)

(Unstable Nightly releases can be found here)


gitbutler_client

CI BADGE TWEET DISCORD INSTA YOUTUBE

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 what we call 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 GB'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.

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

Why GitButler?

We love Git. Our own @schacon has even published the Pro Git book. At the same time, Git's user interface hasn't been fundamentally changed for 15 years. While it was written for Linux kernel devs sending patches to each other over mailing lists, most developers today have different workflows and needs.

Instead of trying to fit the semantics of the Git CLI into a graphical interface, we are starting with the developer workflow and mapping it back to Git.

Tech

GitButler is a Tauri-based application. Its UI is written in Svelte using TypeScript and its backend is written in Rust.

Main Features

  • Virtual Branches
    • Organize work on multiple branches simultaneously, rather than constantly switching branches
    • Automatically create new branches when needed
  • Easy Commit Management
    • Undo, Amend and Squash commits by dragging and dropping
  • GitHub Integration
    • Authenticate to GitHub to open Pull Requests, list branches and statuses and more
  • Easy SSH Key Management
    • GitButler can generate an SSH key to upload to GitHub automatically
  • AI Tooling
    • Automatically write commit messages based on your work in progress
    • Automatically create descriptive branch names
  • Commit Signing
    • Easy commit signing with our generated SSH key

Example Uses

Fixing a Bug While Working on a Feature

Say that while developing a feature, you encounter a bug that you wish to fix. It's often desirable that you ship the fix as a separate contribution (Pull request).

Using Git you can stash your changes and switch to another branch, where you can commit, and push your fix.

With GitButler you simply assign your fix to a separate virtual branch, which you can individually push (or directly create a PR). An additional benefit is that you can retain the fix in your working directory while waiting for CI and/or code review.

Trying Someone Else's Branch Together With My Work in Progress

Say you want to test a branch from someone else for the purpose of code review.

Using Git trying out someone else's branch is a full context switch away from your own work. With GitButler you can apply and unapply (add / remove) any remote branch directly into your working directory.

Documentation

You can find our end user documentation at: https://docs.gitbutler.com

Bugs and Feature Requests

If you have a bug or feature request, feel free to open an issue, or join our Discord server.

AI Commit Message Generation

Commit message generation is an opt-in feature. You can enable it while adding your repository for the first time or later in the project settings.

Currently, GitButler uses OpenAI's API for diff summarization, which means that if enabled, code diffs would be sent to OpenAI's servers.

Our goal is to make this feature more modular such that in the future you can modify the prompt as well as plug a different LLM endpoints (including local ones).

Contributing

So you want to help out? Please check out the CONTRIBUTING.md document.

If you want to skip right to getting the code to actually compile, take a look at the DEVELOPMENT.md file.

Want to show your support? Add a GitButler badge to your project's README:

[![GitButler](https://img.shields.io/badge/GitButler-%23B9F4F2?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMzkiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAzOSAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTI1LjIxNDUgMTIuMTk5N0wyLjg3MTA3IDEuMzg5MTJDMS41NDI5NSAwLjc0NjUzMiAwIDEuNzE0MDYgMCAzLjE4OTQ3VjI0LjgxMDVDMCAyNi4yODU5IDEuNTQyOTUgMjcuMjUzNSAyLjg3MTA3IDI2LjYxMDlMMjUuMjE0NSAxNS44MDAzQzI2LjcxOTcgMTUuMDcyMSAyNi43MTk3IDEyLjkyNzkgMjUuMjE0NSAxMi4xOTk3WiIgZmlsbD0iYmxhY2siLz4KPHBhdGggZD0iTTEzLjc4NTUgMTIuMTk5N0wzNi4xMjg5IDEuMzg5MTJDMzcuNDU3MSAwLjc0NjUzMiAzOSAxLjcxNDA2IDM5IDMuMTg5NDdWMjQuODEwNUMzOSAyNi4yODU5IDM3LjQ1NzEgMjcuMjUzNSAzNi4xMjg5IDI2LjYxMDlMMTMuNzg1NSAxNS44MDAzQzEyLjI4MDMgMTUuMDcyMSAxMi4yODAzIDEyLjkyNzkgMTMuNzg1NSAxMi4xOTk3WiIgZmlsbD0idXJsKCNwYWludDBfcmFkaWFsXzMxMF8xMjkpIi8%2BCjxkZWZzPgo8cmFkaWFsR3JhZGllbnQgaWQ9InBhaW50MF9yYWRpYWxfMzEwXzEyOSIgY3g9IjAiIGN5PSIwIiByPSIxIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgZ3JhZGllbnRUcmFuc2Zvcm09InRyYW5zbGF0ZSgxNi41NzAxIDE0KSBzY2FsZSgxOS44NjQxIDE5LjgzODMpIj4KPHN0b3Agb2Zmc2V0PSIwLjMwMTA1NiIgc3RvcC1vcGFjaXR5PSIwIi8%2BCjxzdG9wIG9mZnNldD0iMSIvPgo8L3JhZGlhbEdyYWRpZW50Pgo8L2RlZnM%2BCjwvc3ZnPgo%3D
)](https://gitbutler.com/)

BADGE