gitbutler

Fixes

• Fixes projects failing to load after choosing gitbutler/workspace as the target branch (a regression from 0.23.0)
• Fixes pushes failing when the target branch has no upstream and the pushed branches have no open pull requests (a regression from 0.23.0)
• Fixes phantom uncommitted changes after staging, renaming or deleting files outside GitButler
• Discarding a file deletion now restores its committed content, even if a different version was staged
• Fixes upstream merge commits showing the wrong pull request title and link
• Fixes worktree removal incorrectly showing a "Worktree … does not exist" error
• Fixes the target branch picker failing with "Expected object of kind commit but got tree" when a remote ref points to a tree

CLI

• but pr new now lets Claude desktop enable Auto-fix for pull requests opened from their checked-out branch
• but apply --json no longer includes the workspaceRefCreated field
• but push <branch> --dry-run now lists every branch that will be pushed, including branches beneath it in the stack
• but branch no longer lists the checked-out branch twice after unapplying down to one branch
• but apply no longer reports an already-applied branch as newly applied
• but commit -b errors in linked worktrees now suggest omitting -b to commit on the worktree's own branch

Experimental

• A new native version of the app is now available under “experimental” in settings.

Full Changelog: https://github.com/gitbutlerapp/gitbutler/compare/release/0.23.0...release/0.23.1

Downloads

Download bins from https://gitbutler.com/

Work in any branch without gitbutler/workspace

GitButler now works in any Git repo, without the need to run a setup or to be on gitbutler/workspace ref. All app operations work as normal. GitButler switches to gitbutler/workspace only when you apply a second parallel branch and moves back when you return to one.

Worktree support

You can now work with linked Git worktrees directly in GitButler. Worktrees created by other apps show up in the CLI status or as lanes in the GUI and support most GitButler operations. For example you (or your agent) can move individual changes, commits or branches to and from worktrees as needed. Parallel branches are light & fast while worktrees offer full code isolation so each tool can be used situationally. Worktrees that already exist when you upgrade start archived. Bring them in from the new Worktrees page in Project settings or with the but CLI. Discarding changes in a worktree can’t be undone yet.

Changes

• Projects now use a local target branch, so GitButler can be used on repos without a remote
• Faster refreshes in Git LFS repositories and after undo, plus faster workspace updates in repositories with many pack files
• Commit signing now honors more Git settings, including X.509 signing and gpg.ssh.defaultKeyCommand
• SHA-256 repositories now support commit signing, rewording, undo and push
• Workspace update previews no longer sign temporary commits or disable signing when a preview signature fails
• GitButler no longer installs its own pre-commit and post-checkout hooks
• Branches can now be dragged below the last branch in a stack

CLI

• zz is now @ for uncommitted changes
• but land is now but merge, and land still works as an alias
• but setup is gone because but works in any repository. but init replaces but setup --init
• but review, but branch new --anchor and ID ranges such as g0-h2 are removed. Use but pr, --above and single IDs instead

Worktrees

• but status lists worktrees with their own IDs and marks ones behind the target
• but worktree creates, lists, archives, restores and removes worktrees. but worktree new can start at a commit with --above or on an existing branch outside the workspace
• but pull --update <workspace|worktrees> picks what to update. A worktree whose branch merged upstream moves to a new branch at the latest target commit
• but move <branch> --above <branch> moves a branch between a worktree and the workspace

New in this release:

• but split moves files or hunks out of a commit into a new commit above it
• but diff <commit> shows hunk IDs, so but squash, but move, but uncommit and but discard can work on single hunks of a commit
• but merge and but pull work without a remote, using the local target branch
• but merge --ff-only refuses merges that can't fast-forward
• but commit, but squash, but move and but split read the message from a file or stdin with -F/--file
• but status marks the checked-out branch with [HEAD]
• b is a default alias for but branch

TUI

• You can squash several marked commits into one
• You can archive (a) and unarchive (u) worktrees
• Mark committed hunks in the details view to discard, squash or move them
• Move a commit's files to another commit, a branch or a new branch
• In move mode, b moves commits onto a new branch above the selected one
• Undo (u) works from details mode
• The status view scrolls with the mouse wheel, and clicking a row selects it
• but tui starts faster, especially on Linux
• Windows: ? and : now respond

Fixes

• Fixes the diff preview jumping to another file when the file list changes
• Fixes workspace loading failures after commits made outside GitButler or a concurrent fetch
• Failed workspace updates now show the error and a retry button; unrelated target or remote history now comes with recovery g

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

Full Changelog: https://github.com/gitbutlerapp/gitbutler/compare/release/0.22.2...release/0.22.3

Downloads

Download bins from https://gitbutler.com/

Changes

• Updating the workspace now fast-forwards a local target branch like main after its remote branch advances

Fixes

• 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

CLI

• but diff --tui is now but tui --diff
• but diff --no-tui and but config ui have been removed

TUI

• Press b in 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

New Contributors

• @macgyver13 made their first contribution in https://github.com/gitbutlerapp/gitbutler/pull/15611

Full Changelog: https://github.com/gitbutlerapp/gitbutler/compare/release/0.22.1...release/0.22.2

Downloads

Download bins from https://gitbutler.com/