git-expert

robconery

更新于 Today

33 次查看

通信general

关于

The git-expert skill provides developers with expert guidance on core Git operations and best practices. It assists with writing conventional commits, resolving merge conflicts, managing branches, and troubleshooting repository issues. Use this skill when you need help crafting commit messages, rebasing, cherry-picking, or implementing branching strategies.

快速安装

Claude Code

技能文档

🔀 Git Expert

Expert guidance for Git operations including commit crafting, conflict resolution, and branch management.

📝 Commit Messages

Format

<type>(<scope>): <subject>

<body>

<footer>

Types

feat: New feature
fix: Bug fix
docs: Documentation only
style: Formatting, no code change
refactor: Code restructuring without behavior change
perf: Performance improvement
test: Adding/updating tests
chore: Build process, dependencies, tooling

Rules

Subject line: max 50 characters, imperative mood ("Add feature" not "Added feature")
Body: wrap at 72 characters, explain what and why, not how
Separate subject from body with blank line
Reference issues in footer: Fixes #123 or Closes #456

Examples

Good:

feat(auth): add OAuth2 login support

Implement Google and GitHub OAuth providers to give users
alternative login methods beyond email/password.

- Add OAuth callback handlers
- Store provider tokens securely
- Link accounts to existing users by email

Closes #234

Bad:

fixed stuff and updated some things

⚔️ Merge Conflicts

Understanding Conflict Markers

<<<<<<< HEAD
Your current branch changes
=======
Incoming changes from merged branch
>>>>>>> feature-branch

Resolution Steps

git status - identify conflicted files
Open each file, locate <<<<<<< markers
Decide what to keep: yours, theirs, or combination
Remove all conflict markers
git add <resolved-files>
git commit (or git merge --continue / git rebase --continue)

Resolution Strategies

Accept ours: git checkout --ours <file>
Accept theirs: git checkout --theirs <file>
Manual merge: Edit file to combine changes
Use mergetool: git mergetool

Abort if Needed

git merge --abort - cancel merge
git rebase --abort - cancel rebase
git cherry-pick --abort - cancel cherry-pick

🌳 Branching

Naming Conventions

feature/short-description
bugfix/issue-number-description
hotfix/critical-fix-name
release/v1.2.0

Common Workflows

Feature Branch:

git checkout -b feature/new-feature main
# ... work ...
git checkout main
git merge feature/new-feature
git branch -d feature/new-feature

Rebase onto main:

git checkout feature/my-feature
git fetch origin
git rebase origin/main
# resolve conflicts if any
git push --force-with-lease

Interactive Rebase (squash commits):

git rebase -i HEAD~3  # last 3 commits
# Change 'pick' to 'squash' or 's' for commits to combine

Branch Commands

Command	Purpose
`git branch`	List local branches
`git branch -a`	List all branches (including remote)
`git branch -d <name>`	Delete merged branch
`git branch -D <name>`	Force delete branch
`git branch -m <new>`	Rename current branch
`git switch <branch>`	Switch branches (modern)
`git switch -c <new>`	Create and switch

🔧 Useful Commands

Inspection

git log --oneline --graph --all    # visual history
git log -p <file>                  # file history with diffs
git blame <file>                   # line-by-line authorship
git show <commit>                  # commit details
git diff <branch1>..<branch2>      # compare branches

Undo Operations

git reset --soft HEAD~1   # undo commit, keep staged
git reset --mixed HEAD~1  # undo commit, unstage (default)
git reset --hard HEAD~1   # undo commit, discard changes ⚠️
git revert <commit>       # create inverse commit (safe)
git restore <file>        # discard working changes
git restore --staged <file>  # unstage file

Stashing

git stash                 # stash changes
git stash pop             # apply and remove stash
git stash list            # show stashes
git stash show -p         # show stash diff
git stash drop            # remove top stash

Cherry-picking

git cherry-pick <commit>           # apply single commit
git cherry-pick <c1>..<c2>         # apply range (exclusive)
git cherry-pick <c1>^..<c2>        # apply range (inclusive)
git cherry-pick --no-commit <c>    # apply without committing

🚨 Recovery

Find Lost Commits

git reflog                # show all HEAD movements
git checkout <hash>       # recover to specific point
git branch recover <hash> # create branch at lost commit

Fix Last Commit

git commit --amend              # edit message or add files
git commit --amend --no-edit    # add staged files silently

Clean Untracked Files

git clean -n    # dry run - show what would be deleted
git clean -f    # delete untracked files
git clean -fd   # delete untracked files and directories

GitHub 仓库

robconery/github-dev

路径: resources/claude/git-skill.md