Git Advanced

Use when performing complex git operations -- rebasing, cherry-picking, resolving merge conflicts, bisecting bugs, managing stashes, cleaning history, or working with monorepos. Goes beyond basic commit/push/pull.

5 starsGit & Code Review Plugin marketplace

Install

Claude Code plugin
/plugin marketplace add Sagargupta16/claude-skills

The repo is a Claude Code plugin marketplace. Run /plugin afterwards to pick the plugin that includes this skill.

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add Sagargupta16/claude-skills --skill git-advanced
Manual install
git clone --depth 1 https://github.com/Sagargupta16/claude-skills.git /tmp/claude-skills
mkdir -p ~/.claude/skills
cp -r /tmp/claude-skills/plugins/git-advanced/skills/git-advanced ~/.claude/skills/git-advanced

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Advanced Git Patterns

## Quick Reference

| Task | Command |
|------|---------|
| Rebase onto main | `git rebase main` |
| Interactive rebase (squash) | `git rebase -i HEAD~N` |
| Cherry-pick a commit | `git cherry-pick <sha>` |
| Find bug introduction | `git bisect start` |
| Stash with name | `git stash push -m "description"` |
| Undo last commit (keep changes) | `git reset --soft HEAD~1` |
| See what changed in a file | `git log -p -- path/to/file` |
| Find who changed a line | `git blame path/to/file` |

## Rebase Workflows

### Rebase feature branch onto main

```bash
git checkout feature-branch
git fetch origin
git rebase origin/main
# Fix conflicts if any, then:
git push --force-with-lease  # safer than --force
```

Use `--force-with-lease` instead of `--force` -- it refuses to push if someone else has pushed to the branch since your last fetch.

### Interactive Rebase (clean up commits)

```bash
git rebase -i HEAD~5  # last 5 commits
```

In the editor:
```
pick abc1234 feat: add user model
squash def5678 fix typo in user model
squash ghi9012 more fixes
pick jkl3456 feat: add user routes
fixup mno7890 cleanup
```

| Command | Effect |
|---------|--------|
| `pick` | Keep commit as-is |
| `squash` | Merge into previous, combine messages |
| `fixup` | Merge into previous, discard message |
| `reword` | Keep commit, edit message |
| `drop` | Remove commit entirely |

### When to Rebase vs Merge

| Rebase | Merge |
|--------|-------|
Read the full skill on GitHub

Details

Skill name
git-advanced
Path
plugins/git-advanced/skills/git-advanced/SKILL.md
License
MIT
Repo updated
13 November 2026

FAQ

What does the Git Advanced skill do?

Use when performing complex git operations -- rebasing, cherry-picking, resolving merge conflicts, bisecting bugs, managing stashes, cleaning history, or working with monorepos. Goes beyond basic commit/push/pull.

How do I install the Git Advanced skill?

Claude Code plugin: /plugin marketplace add Sagargupta16/claude-skills. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Git Advanced popular?

It lives in Sagargupta16/claude-skills, which has 5 GitHub stars and 0 forks.

Related skills

Clean Code

5

Sagargupta16/claude-skills

Use when the user writes new Python, or asks for review, refactor, or cleanup of Python code, names, comments/docstrings, functions, or tests. Applies Robert Martin's complete Clean Code catalog -- naming, functions, comments, DRY, boundary conditions, and tests -- to the code being changed.

Software Development

Context Management

5

Sagargupta16/claude-skills

Use when managing Claude Code context window during long sessions, when context feels degraded, or when deciding between /compact, /clear, /rewind, and sub-agents. Covers context rot detection, compaction timing, branching strategy, and sub-agent isolation patterns.

AI, LLMs & Agents

Debug Triage

5

Sagargupta16/claude-skills

Use when triaging a pasted error, stack trace, or terminal transcript. Activates on "debug this", "fix this", "why is this broken", or when a user pastes red terminal output. Produces a tight cause-fix-test report, not a lecture.

Software Development

Git Guardrails

9

sandbaseai/workbuddy-skill

Use when configuring repository-scoped safeguards that detect and gate destructive or externally visible Git commands before execution.

Git & Code Review

Gh Fix CI

5

euxx/claude-skills-for-copilot

Debug failing GitHub Actions CI checks on the current branch's PR using the gh CLI — inspect logs, summarize root cause, and propose a focused fix plan before implementing.

Git & Code Review

Github Actions Efficiency

9

sandbaseai/workbuddy-skill

Use when auditing GitHub Actions runtime, CI cost, wasted runs, caching, concurrency, path filters, matrix breadth, duplicate coverage, or job critical paths.

Git & Code Review

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.