Skip to content

docs(faq): correct rebase FAQ to match actual behavior#1370

Open
bymle wants to merge 1 commit into
anthropics:mainfrom
bymle:bymle/fix-rebase-faq
Open

docs(faq): correct rebase FAQ to match actual behavior#1370
bymle wants to merge 1 commit into
anthropics:mainfrom
bymle:bymle/fix-rebase-faq

Conversation

@bymle

@bymle bymle commented Jun 1, 2026

Copy link
Copy Markdown

Summary

The Why won't Claude rebase my branch? FAQ entry tells users they can enable rebasing by adding --allowedTools "Bash(git rebase:*)" to claude_args. This doesn't work in practice.

The system prompt built in src/create-prompt/index.ts unconditionally lists rebasing under "What You CANNOT Do":

- Perform branch operations (cannot merge branches, rebase, or perform other git operations beyond creating and pushing commits)

There is no condition on the contents of --allowedTools, so Claude follows the system prompt and declines the request even when the git tool is explicitly allowed. As reported in #1286, users (including the reporter) followed the FAQ's guidance and assumed it was working when it was not.

Change

Docs-only. Update the FAQ to:

  • describe the actual behavior (Claude only creates and pushes commits; branch operations are blocked),
  • note that granting Bash(git rebase:*) does not override this, and
  • point users to the real workaround (rebase locally or via the Claude Code CLI, then push).

No code or behavior changes.

Closes #1286

The "Why won't Claude rebase my branch?" FAQ told users they could
enable rebasing by passing `--allowedTools "Bash(git rebase:*)"` via
claude_args. This does not work: the system prompt built in
src/create-prompt/index.ts unconditionally instructs Claude that it
cannot merge, rebase, or perform branch operations beyond creating and
pushing commits, so Claude declines rebase requests regardless of the
allowed tools.

Update the FAQ to describe the actual behavior and point users to the
real workaround (rebase locally or via the Claude Code CLI).

Closes anthropics#1286
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

FAQ says Bash(git rebase:*) enables rebase, but the hardcoded system prompt overrides it

1 participant