agentsclimarketplace

Rebase

Skill lgtm-hq/ai-skills/skills/rebase

Canonical Agent Skills library for Claude Code, Cursor, Codex, and other agents.

Install
npx -y skills add lgtm-hq/ai-skills --skill rebase

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

One thing to look at

  • 0 stars0 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Rebase the current branch onto the latest main. Use when asked to rebase, sync with main, update branch, or pull latest changes. Fetches and rebases onto latest main; does not push automatically.

SKILL.md

1.6 KB, 368 tokens by cl100k_base, as published. Nobody here has run it

Rebase

Rebase the current branch onto the latest origin/main.

Usage

When asked to rebase:

  1. Check current state:

    git status
git branch --show-current
    • If on main, warn the user and stop — rebasing main onto itself is a no-op
    • If there are uncommitted changes, warn the user and stop — do NOT stash automatically

  2. Fetch latest:

    git fetch origin

  3. Rebase onto main:

    git rebase origin/main

  4. Handle conflicts:

    • If the rebase succeeds cleanly, proceed to step 5
    • If there are conflicts:
      • List the conflicting files
      • Ask the user how they want to proceed: resolve manually, or abort
      • Do NOT force-continue or blindly resolve conflicts
      • To abort: git rebase --abort

  5. Confirm — Print a summary:

    Rebased feat/123-add-watch-mode onto origin/main
    • Do NOT push automatically
    • If the user explicitly asks to push, use git push --force-with-lease
    • NEVER use --force — always --force-with-lease for safety

Important

  • NEVER rebase main itself
  • NEVER use git push --force — always --force-with-lease
  • NEVER stash or discard uncommitted changes — warn and stop
  • NEVER use --no-edit or -i flags with rebase
  • If conflicts occur, always involve the user — never auto-resolve

What ships with it

Read from the repository

Just SKILL.md. No reference files, no scripts.

Gives 0 of the 12 instructions most pr commit review skills give in 368 tokens

Counted across 888 of the 1,342 authors here whose files we hold, read 2026-08-07

  • Use conventional commits formatin 127 of 888, across 115 files
  • Keep subject line under 72 charactersin 62 of 888, across 48 files
  • Delete branches after mergein 51 of 888, across 38 files
  • Use imperative mood in subject linein 51 of 888, across 42 files
  • Use imperative mood in commit messagesin 44 of 888
  • Verify directory is ignored before creating worktreein 43 of 888, across 12 files
  • Generate a conventional commit messagein 43 of 888
  • Add unignored worktree directories to gitignorein 42 of 888, across 10 files
  • Make atomic commitsin 39 of 888, across 27 files
  • Run tests before committingin 36 of 888, across 25 files
  • Verify clean test baselinein 35 of 888, across 9 files
  • Split unrelated changes into separate commitsin 35 of 888, across 30 files

Said here and by no other author read

  • ask user how to resolve conflicts
  • print a rebase summary

Grouped from the skills themselves: near-identical wordings counted once, and counted by distinct author, so one author publishing three of these counts once. Length counted with cl100k_base; the agent that loads this file may tokenize it differently.

Keep looking

Skills are one crate of 328,083. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.