Git

Git operations, conflict resolution, history management, and Git workflows. Use for complex Git operations and version control tasks.

Install

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

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

From the SKILL.md

# Git Skill

Advanced Git operations and workflows.

## 1. Branch Management

```bash
# Create and switch branch
git checkout -b feature/new-feature

# Rename branch
git branch -m old-name new-name

# Delete branch
git branch -d feature-branch  # Safe delete
git branch -D feature-branch  # Force delete

# List branches
git branch -a  # All branches
git branch -r  # Remote branches
```

## 2. Commit Management

```bash
# Amend last commit
git commit --amend -m "New message"

# Interactive rebase (last 3 commits)
git rebase -i HEAD~3

# Cherry-pick commit
git cherry-pick <commit-hash>

# Revert commit
git revert <commit-hash>

# Reset (careful!)
git reset --soft HEAD~1  # Keep changes staged
git reset --mixed HEAD~1  # Keep changes unstaged
git reset --hard HEAD~1  # Discard changes
```

## 3. Conflict Resolution

```bash
# During merge conflict
git status  # See conflicted files

# Edit conflicted files, then:
git add <resolved-file>
git commit

# Abort merge
git merge --abort

# Use specific version
git checkout --ours <file>    # Keep your changes
git checkout --theirs <file>  # Use their changes
```

## 4. Stash Operations

```bash
# Stash changes
git stash save "work in progress"

# List stashes
git stash list

# Apply stash
git stash apply stash@{0}
git stash pop  # Apply and remove

# Drop stash
git stash drop stash@{0}

# Create branch from stash
git stash branch new-branch
```

## 5. History and Search
Read the full skill on GitHub

Details

Skill name
git
Path
skills/git/SKILL.md
Repo updated
22 January 2026

FAQ

What does the Git skill do?

Git operations, conflict resolution, history management, and Git workflows. Use for complex Git operations and version control tasks.

How do I install the Git skill?

skills CLI (Claude Code, Cursor, Codex and more): npx skills add thechandanbhagat/claude-skills --skill git. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Git popular?

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

Related skills

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