Source Intelligence
Follow Discord

DisclaimerUnofficial, and not affiliated with Anthropic. Nearly all of this is read straight out of what ships: npm bundles, captured prompts, published docs. Anthropic's own notes go in verbatim, marked as theirs. The rest is my reading, and every entry carries the strings behind it. If one looks wrong, vote it down and say why.

← All of v2.0.60 Home All releases ←olderv2.0.59 v2.0.61newer→
Claude Code v2.0.60

Git Rebase/Merge State Detection

What: Claude now detects when git is in the middle of a rebase, merge, cherry-pick, or revert operation and skips the diff display to avoid confusing partial state.

Details:

  • Added rm5() function at line 405566 that checks for git state files:
  • MERGE_HEAD - merge in progress
  • REBASE_HEAD - rebase in progress
  • CHERRY_PICK_HEAD - cherry-pick in progress
  • REVERT_HEAD - revert in progress
  • The ky2() function at line 405477 now calls rm5() and returns early if any state file exists
  • Evidence: New function added at line 16108, integration at line 17927

Related

Other releases about the same thing. Found by shared names or similar wording; neither means one caused the other.

See this entry in the whole of v2.0.60 →