CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

git-rebase

Rebase the current branch onto a target branch using safety checks and an appropriate rebase strategy. Use when invoked as `$git-rebase` or when the user asks to update/rebase a branch.

Quality

86%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide
SecuritybySnyk

Passed

No findings from the security scan

SKILL.md
Quality
Evals
Security

Quality

Content

82%Weight 40%Scale 1-5

Reviews the quality of instructions and guidance provided to agents. Good implementation is clear, handles edge cases, and produces reliable results.

A lean, highly actionable rebase runbook with real validation checkpoints around its destructive operations (force-push, history rewrite). The main defects are a workflow numbering error (step 4 is skipped) and the cherry-pick path being described rather than scripted.

Suggestions

Fix the workflow numbering: the steps jump from 3 to 5 with no step 4, which makes the sequence appear broken even though the content flows.

Provide executable commands for the cherry-pick strategy (e.g. `git checkout -b "${subject}__cherrypick__" "${target_ref}"` followed by the explicit cherry-pick invocation) so all three strategy branches are copy-paste ready.

Guard the post-push tracking step: `git branch --set-upstream-to="origin/${subject}"` fails if the remote branch does not yet exist, so cover the first-push case (e.g. rely on `git push -u` alone when `origin/${subject}` is absent).

DimensionReasoningScore

Conciseness

The body is almost entirely executable commands plus genuinely non-obvious domain guidance (rerere recovery, filtered machine-state files, the worktree fetch caveat), with no padding and no explanation of concepts Claude already knows. It matches anchor 5 (lean, every token earns its place); anchor 4 would require some trimmable over-explanation, which is absent.

5 / 5

Actionability

Context gathering, divergence analysis, simple/onto rebase, and push are given as exact runnable commands. However the cherry-pick strategy is only described ("create `<subject>__cherrypick__` from `target_ref` and cherry-pick subject commits oldest-first") without executable commands, and `git branch --set-upstream-to="origin/${subject}"` silently assumes the remote branch already exists. This is anchor 4 (mostly executable, minor gaps) rather than anchor 5 (copy-paste ready across all paths).

4 / 5

Workflow Clarity

The sequence has strong checkpoints for a destructive workflow: dirty-tree stop condition, analysis shown before proceeding, conflict-marker verification before `--continue`, rerere-based recovery, and `--force-with-lease` for the push. But the numbered workflow skips step 4 entirely (it jumps from 3 to 5), a real sequencing defect that keeps it below anchor 5; it stays above anchor 3 because validation for the destructive and batch operations is explicitly present.

4 / 5

Progressive Disclosure

The skill is a single well-organized file with no bundle files, and the Workflow sectioning is clear. At roughly 75 lines it exceeds the simple-skill threshold, and the strategy-selection table and conflict-resolution heuristics are cohesive but arguably separable into a reference file. This lands on anchor 4 (good structure, minor organization gaps) rather than anchor 5 (clean overview with well-signaled split references).

4 / 5

Total

17

/

20

Passed

Description

82%Weight 40%Scale 1-5

Based on the skill's description, can an agent find and select it at the right time? Clear, specific descriptions lead to better discovery.

A concise, well-scoped description that clearly states what the skill does and when to use it, with natural trigger terms and minimal conflict risk. Its only weakness is specificity: beyond the core rebase action, capabilities are gestured at ("safety checks", "appropriate rebase strategy") rather than named concretely.

Suggestions

Enumerate the concrete capabilities in the description, e.g. mention conflict auto-resolution, cherry-pick strategy selection, and re-pushing with --force-with-lease, so specificity moves from 'rebase plus manner adjectives' to a list of distinct actions.

Add one or two more natural trigger phrasings users commonly say, such as "update my branch from main" or "pull main into my branch", to broaden trigger coverage.

DimensionReasoningScore

Specificity

"Rebase the current branch onto a target branch" names the domain and one concrete action; "using safety checks and an appropriate rebase strategy" describes manner rather than enumerating additional concrete actions (conflict resolution, push, tracking are absent). This matches anchor 3 (domain plus 1-2 concrete actions) rather than anchor 4, which expects several listed specific actions.

3 / 5

Completeness

It explicitly answers both questions: the "what" ("Rebase the current branch onto a target branch using safety checks and an appropriate rebase strategy") and the "when" with concrete trigger phrases ("Use when invoked as `$git-rebase` or when the user asks to update/rebase a branch"). This is a clear anchor-5 match; anchor 4 would require the "when" clause to be less explicit.

5 / 5

Trigger Term Quality

"Use when invoked as `$git-rebase` or when the user asks to update/rebase a branch" captures the natural keyword "rebase" plus the synonym "update a branch". It falls short of anchor 5 because common variations like "pull in changes from main" or "bring my branch up to date" are not covered.

4 / 5

Distinctiveness Conflict Risk

The description is tightly scoped to git rebasing, a clear niche with distinct triggers ("rebase", "update/rebase a branch"), so it is unlikely to fire for unrelated skills. It matches anchor 5 (clear niche, minimal conflict risk) and not anchor 4, which anticipates overlap with closely related skills.

5 / 5

Total

17

/

20

Passed

Validation

100%

Checks the skill against the spec for correct structure and formatting. All validation checks must pass before discovery and implementation can be scored.

Validation — 16 / 16 Passed

Validation for skill structure

No warnings or errors.

Repository

phatblat/dotfiles

Path

.agents/skills/git-rebase/SKILL.md

Reviewed

Table of Contents

Is this your skill?

If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.