$ inspect GitButler
repo: https://github.com/gitbutlerapp/gitbutler
language: Rust
status: indexed
$ cat ./gitbutler.md
GitButler
GitButler is a modern Git client that revolutionizes branch management by introducing virtual branches, allowing developers to work on multiple features simultaneously without traditional branch switching. The tool enables users to create, manage, and apply changes across different workstreams in real-time, with the ability to selectively commit hunks to different virtual branches from a single working directory. Key features include intelligent conflict resolution, seamless integration with existing Git workflows, and an intuitive interface that simplifies complex Git operations. GitButler excels in scenarios requiring parallel development, feature experimentation, and collaborative workflows where developers need to context-switch between multiple tasks efficiently. The tool maintains full Git compatibility while providing enhanced productivity through its innovative virtual branch system, making it ideal for teams managing complex codebases and multiple concurrent features.
21,806 stars
1,031 forks
Rust
Other
Login with GitHub to like and favorite this CLI tool
$ git release --latest
Latest Releases
All releases
Fixes
- Fixes an incorrect GitHub or GitLab authentication error when syncing a project without a connected forge integration
- Fixes GitHub pull request publishing failures showing "422 Unprocessable Entity" instead of GitHub's explanation of what needs fixing
- Fixes a 0.22.2 regression were in some cases the app uses a fallback committer value instead of the configured Git identity
Changes
- Updating the workspace now fast-forwards a local target branch like
mainafter its remote branch advances
- GitHub repositories with 100 or more open pull requests now refresh correctly as pull request activity changes
- GitLab: An open merge request with no head commit no longer breaks merge request loading
- Edit mode no longer crashes on conflicts in non-UTF-8 files or treats those conflicts as resolved
- Workspace syncs no longer fail when a remote the workspace does not use cannot be fetched
- Uncommitted changes now load correctly when staged and unstaged changes overlap
- Slow fetch, push, and clone operations are no longer cancelled after two minutes
- Pull request and merge request information stays visible when GitHub, GitLab, or Bitbucket credentials are missing or a refresh fails due to a network error
- Onboarding no longer gets stuck when no Git identity is configured
- Restoring operation history now keeps the full stack when duplicate branch names exist across stacks
- Unapplying a stack no longer fails when its branch names also exist in another stack
- Updating a branch from upstream no longer fails with "BUG: Add edge introduces a cycle" after a local upstream merge
- Pull requests are no longer shown as "not mergeable" while merge status is still loading or temporarily unavailable
but diff --tuiis nowbut tui --diffbut diff --no-tuiandbut config uihave been removed
- Press
bin the TUI to enter branch mode, where branches can now be discarded - You can now create a new branch and switch to it, including positioning it above or below another branch
- Adds branch search, so you can find an existing branch and switch to it
- Commits can now be moved to a new branch
- @macgyver13 made their first contribution in https://github.com/gitbutlerapp/gitbutler/pull/15611
Changes
- macOS: Holding
⌘while selecting a project now shows that it will open in a new window - Adds "Create PR" and "Land" to the branch context menu, so both actions are available regardless of the "Land branches directly" setting
- When updates from the target branch conflict with uncommitted work, GitButler now keeps both versions, shows the files as conflicted, and lets you mark them as resolved
- Fixes unexpected vertical scrolling of the workspace while dragging branches between lanes
- Fixes tracked files being deleted in some workspaces after landing a branch
- Fixes failed GitHub operations showing a generic response-decoding error instead of GitHub's actual error message
- Fixes rebase operations unexpectedly moving tags
- Fixes conflicted commits losing their conflict state when reworded
- Fixes stale uncommitted files being shown after commits made by the CLI or another process
- Fixes clean commits being incorrectly treated as conflicted
- Fixes commit and merge request links using the wrong URL for self-hosted forges reached over SSH on a non-standard port
- Fixes workspace updates failing after a branch in a stack was squash-merged upstream
- Fixes "Open in browser" requiring a second click from the branch menu
- Fixes the diff view failing to highlight commits that uncommitted changes depend on
- Fixes successful pushes to branches tracking a non-default remote being reported as failures
- Fixes GitLab projects with many merge requests not showing all of them
- Fixes some GitHub pull requests getting stuck at "mergeability is unknown", leaving the Merge action disabled
- Fixes GitHub repositories with more than 100 open pull requests not showing all of them
- Fixes a branch-not-found error in the branch view after the displayed branch was integrated, landed, or deleted
- Fixes project-not-found errors that could appear after deleting a project or cancelling project setup
- Adds
but resolve conflictsandbut resolve applyfor inspecting and resolving individual conflicts in conflicted commits without checking them out but commitcan now target any branch chosen from the picker, including branches lower in a stackbut commit,but amend,but move, andbut squashnow show example commands when arguments are invalidbut move <branch> --branch <other-branch>can now stack one branch onto anotherbutnow detects the terminal's light or dark theme automatically;BUT_THEMEstill overrides it- Adds
c,m, andsas default aliases forbut commit,but move, andbut squash but picknow supports branch targeting with--branch,--above, and--belowbut squashandbut discardnow accept directory paths to select the uncommitted changes within thembut discardwith no target now discards all uncommitted changesbut uncommit <branch>now moves the branch's commits back to uncommitted changes and removes the branchbut discard --jsonandbut move --jsonnow include atypefield on each result- The
but pushpicker now shows one entry per stack and which ancestor branches will also be pushed but branch newnow supports--aboveand--belowfor positioning branches;--anchorand-aremain deprecated aliases for--abovebut landnow deletes the branch from its push remote after landing succeedsbut branch --helpnow points tobut rewordfor renaming branches- Improved the guidance shown to coding agents when the GitButler skill is missing or a CLI update is available
- DeepSeek Harness (
dsh) is now detected as a coding agent, with automatic skill setup but pullnow keeps both versions when target-branch updates conflict with uncommitted work; resolve the files withbut resolve <path>...but pr newnow reports the branch and remote that were actually pushed tobut push --jsonnow includes the destination branch name in eachbranchToRemoteentrybut unapplynow explains how to create a branch when the commits being unapplied are not attached to onebut pushnow exits non-zero when one or more branches in a batch fail to pushbut rewordnow preserves conflict state when rewording a conflicted commitbut status,but pull, andbut commitno longer fail when a clean commit is incorrectly marked as conflicted- Fixes
but pushfailing to detect conflicted commits in ancestor branches before pushing - Fixes
but landandbut pulldeleting tracked files in some workspaces - Fixes
but statusfailing with a "too many IDs" error in repositories with a very large number of untracked files - Fixes
but pullfailing when a branch in a stack was squash-merged upstream
- Improved diff rendering performance, especially for uncommitted files
- You can now switch directly between commit, squash, and move modes in the TUI
but tui <ID>can now open directly on a branch, commit, file, or hunk;--diffopens the diff view immediately and replaces the deprecatedbut diff --tui- Improved the TUI graph preview when moving a branch out of a stack
- You can now uncommit an entire branch in the TUI
- You can now press
pin the TUI to cherry-pick the selected commit - The TUI action bar now lists
commitbeforesquashwhen both are available - Fixes ANSI color codes appearing in TUI error messages
- Fixes stale selection marks remaining after closing a commit's file list in the TUI
- Fixes conflicted commits losing their conflict state when reworded in the TUI
- @C0rn3j made their first contribution in https://github.com/gitbutlerapp/gitbutler/pull/15404
Changes
Native GitHub Stacked PR Support is available in gitbutler 🥞🎉
- GitButler now automatically uses GitHub's native stacked pull requests for enrolled repositories, falling back to description footers otherwise
- You can now choose per project whether GitButler adds stack metadata to pull and merge request descriptions
- Cherry-picking now creates conflicted commits when a pick conflicts instead of blocking it
commit, amend, squash, discard and move. The commands rub, stage and unstage have been removed. For agentic use its important to update the skill (but skill check --update)
- The CLI no longer reads change assignments from the desktop app. All worktree changes are treated as uncommitted;
but stage,but unstage, andbut commit --onlyhave been removed but commitnow takes sources positionally and uses-b/--branchfor the target branch and--aboveor--belowfor stackingbut squashstill takes sources positionally but now uses-t/--targetfor the target. It can squash all types of sources into commits, branches, and the uncommitted area.but amendandbut uncommitwork similarly tobut squashbut movestill takes sources positionally but now uses-t/--target,--above, or--belowfor the target. It can move commits, committed files, and branches. Use--unstackto unstack a branchbut rubhas been replaced bybut squashbut amendandbut squashnow default to uncommitted changes when you omit the source argument- Mutation commands now print concise results with change IDs by default
--jsonis now the standard machine-readable output flag, replacing--format json- History-editing commands now refuse to modify commits already merged upstream, with
--allow-mergedavailable for deliberate overrides - Errors now include recovery guidance for history edits, pull conflicts, cherry-picks, and pull or merge request actions, including newly conflicted commits and operations rejected by commit dependencies
- The TUI now has a dedicated squash mode that lets you select the source or target first and squash across multiple branches, replacing rub mode
- The TUI can now open files and hunks in configured external programs, with multi-file selection, user-defined macOS apps, and per-extension defaults
- The TUI can now discard multiple branches at once
- The TUI now supports
--remember-selection, restoring the previous selection when reopened - TUI diffs now use Catppuccin syntax highlighting
- Fixes tab indentation in TUI diffs
- Fixes web links for self-hosted forges that use a custom port
- Fixes an issue where failed cherry-picks could fail silently
- Fixes merge handling so adjacent edits to the same file are detected as conflicts, matching Git's behavior
- Bitbucket: Fixes an issue where pull requests created through GitButler omitted default reviewers
What's Changed
- Fixes a 0.21.1 regression where a pull request cache left by an older version could break the workspace after upgrading
- Fixes an issue where updating a branch from upstream could fail
- Bitbucket: Fixes an issue where build status checks could fail to load in some cases
- Fixes an issue where a "part 1 of 1 in a stack" footer could be added to pull requests that aren't part of a stack
Installation
curl -fsSL https://gitbutler.com/install.sh | sh
$ tail ./comments.log
Comments (0)
Login with GitHub to post a comment
No comments yet. Be the first to comment!