jimeh/.vscode.d
1
0
Fork 0
mirror of https://github.com/jimeh/.vscode.d.git synced 2026-02-19 11:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(claude/commands): add missing tool permissions to rebase command

Browse Source 
Context template commands go through the tool permission system, so
all git subcommands used in context and task steps need allowed-tools
entries. Add git status, git branch, and git rev-parse. Replace piped
git symbolic-ref|sed with git rev-parse --abbrev-ref to avoid needing
a sed permission.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jim Myhrberg
2026-02-09 00:12:16 +00:00
parent 7d3af85adb
commit c27f891365
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
claude/commands/rebase.md
View File

@@ -1,12 +1,12 @@
---
allowed-tools: Bash(git fetch:*), Bash(git rebase:*), Bash(git stash:*), Bash(git diff:*), Bash(git log:*), Bash(git add:*), Read, Edit
allowed-tools: Bash(git fetch:*), Bash(git rebase:*), Bash(git stash:*), Bash(git status:*), Bash(git diff:*), Bash(git log:*), Bash(git add:*), Bash(git branch:*), Bash(git rev-parse:*), Read, Edit
description: Rebase current branch onto upstream main/master
---
## Context
- Current branch: !`git branch --show-current`
- Default branch: !`git remote show origin | sed -n 's/.*HEAD branch: //p'`
- Default branch: !`git rev-parse --abbrev-ref origin/HEAD 2>/dev/null`
- Uncommitted changes: !`git status --short`
## Your Task
@@ -17,7 +17,7 @@ Rebase the current branch onto the upstream default branch (main or master).
`git stash push -m "auto-stash before rebase"`.
2. Fetch the latest from origin: `git fetch origin`.
3. Rebase onto the default branch using the value from context above:
`git rebase origin/<default-branch>`.
`git rebase <default-branch>`.
4. If the rebase succeeds and changes were stashed in step 1, run
`git stash pop`.
5. Show the result with `git log --oneline -10`.