You'll noticeTier: how much it should matter to you
2Useful: my rating, 1 to 5
1Signal: worth watching, 1 to 5
GitArea: what it touches
Bug FixesKind: in v2.1.300,
Bug FixesSection of the release
What
Claude Code checks whether a git operation such as a merge, rebase, cherry-pick or revert is in progress. Before this release, the mere presence of git's marker files CHERRY_PICK_HEAD, REVERT_HEAD or REBASE_HEAD counted as proof. Now Claude Code runs git show-ref --exists to confirm those references are real, and only reports an operation in progress if one is.
A merge marker, and a rebase marker together with git's rebase folder, still count straight away.
Why
After an aborted cherry-pick or revert, git can leave a stale marker file behind. Claude Code is now less likely to wrongly say a git operation is in progress because of one.