Feature/active branch - #6
Merged
Merged
Conversation
…emote The tick was the only thing marking where you stand. The sidebar row for the checked-out branch now carries the accent tint, a gold left edge and a bolder name, and its chip in the graph is filled solid instead of tinted like every other branch. When a local branch and its remote have drifted apart their chips sit on different commits; double-clicking the remote one asks whether to hard-reset the local branch onto it — naming the commits that would be lost — or cancel. A branch that is not checked out is checked out first as its own undo entry, so undoing twice restores both steps; a branch held by another worktree is refused. The demo repo now puts origin/main two commits behind main so the split is real there too. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Reading a diff and wanting the rest of the story meant backing out to the file's row menu or the command palette. A history button now sits beside the whole-file toggle and swaps the center panel to that file's history. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
cheat2001
approved these changes
Sep 7, 2026
cheat2001
left a comment
cheat2001
left a comment
Owner
There was a problem hiding this comment.
Merged this into 0.11.0 with one change on top: the reset prompt now only appears when the local branch has its own commits, a branch that's merely behind gets a plain checkout that fast-forwards it. Thanks for the history button in the diff header, that one's already saving me clicks.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What & why
Screenshots
Checklist
pnpm typecheck && pnpm testpasscargo fmt --check && cargo clippy --all-targets -- -D warnings && cargo testpass (if Rust changed)tests/git_engine.rstracked()wrapper where undoableCLAUDE.mdupdated if conventions/architecture changed