メニュー
Quick reference for common Git commands and workflows. Use when working with version control, committing changes, managing branches, or resolving Git issues. Covers daily Git operations, branching strategies, and troubleshooting.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| name | git-workflow |
| description | Quick reference for common Git commands and workflows. Use when working with version control, committing changes, managing branches, or resolving Git issues. Covers daily Git operations, branching strategies, and troubleshooting. |
A concise reference for common Git commands and workflows used in daily development. This skill provides quick access to frequently-used Git operations without searching documentation.
# View current status
git status
# View changes in working directory
git diff
# View staged changes
git diff --cached
# View commit history
git log --oneline --graph --all
# Stage specific files
git add <file1> <file2>
# Stage all changes
git add .
# Stage only modified files (not new files)
git add -u
# Commit staged changes
git commit -m "Commit message"
# Add and commit in one step
git commit -am "Commit message"
# Amend last commit
git commit --amend
# Fetch changes from remote
git fetch origin
# Pull changes (fetch + merge)
git pull origin main
# Push commits to remote
git push origin main
# Push new branch to remote
git push -u origin <branch-name>
# Create new branch
git branch <branch-name>
# Switch to branch
git checkout <branch-name>
# Create and switch in one step
git checkout -b <branch-name>
# Switch to previous branch
git checkout -
# List all branches
git branch -a
# Merge branch into current branch
git merge <branch-name>
# Rebase current branch onto main
git rebase main
# Interactive rebase (squash, reorder commits)
git rebase -i HEAD~3
# Abort merge/rebase
git merge --abort
git rebase --abort
# Delete local branch
git branch -d <branch-name>
# Force delete local branch
git branch -D <branch-name>
# Delete remote branch
git push origin --delete <branch-name>
# Unstage file (keep changes)
git restore --staged <file>
# Discard changes in working directory
git restore <file>
# Discard all local changes
git restore .
# Revert specific commit (creates new commit)
git revert <commit-hash>
# Reset to previous commit (soft - keep changes)
git reset --soft HEAD~1
# Reset to previous commit (hard - discard changes)
git reset --hard HEAD~1
# Reset to specific commit
git reset --hard <commit-hash>
# Stash current changes
git stash
# Stash with message
git stash save "Work in progress"
# List stashes
git stash list
# Apply most recent stash
git stash apply
# Apply and remove stash
git stash pop
# Apply specific stash
git stash apply stash@{2}
# Delete stash
git stash drop stash@{0}
# Clear all stashes
git stash clear
# Initialize new repository
git init
# Clone repository
git clone <url>
# Clone to specific directory
git clone <url> <directory>
# Clone specific branch
git clone -b <branch-name> <url>
# Add remote
git remote add origin <url>
# View remotes
git remote -v
# Change remote URL
git remote set-url origin <new-url>
# Remove remote
git remote remove origin
# View files with conflicts
git status
# After resolving conflicts manually
git add <resolved-file>
git commit
# Abort merge and start over
git merge --abort
# Search for text in commits
git log -S "search term"
# View specific commit
git show <commit-hash>
# View file at specific commit
git show <commit-hash>:<file-path>
# Find who changed a line
git blame <file>
# View reflog (history of HEAD)
git reflog
# Remove untracked files (dry run)
git clean -n
# Remove untracked files
git clean -f
# Remove untracked files and directories
git clean -fd
# Good commit message format:
# <type>: <subject>
#
# <body>
# Examples:
git commit -m "feat: Add user authentication"
git commit -m "fix: Resolve login redirect bug"
git commit -m "docs: Update API documentation"
git commit -m "refactor: Simplify validation logic"
feature/<feature-name> # New features
bugfix/<bug-name> # Bug fixes
hotfix/<issue> # Urgent fixes
release/<version> # Release preparation
Feature Branch Workflow:
# 1. Create feature branch
git checkout -b feature/new-feature
# 2. Work and commit
git add .
git commit -m "feat: Implement new feature"
# 3. Push to remote
git push -u origin feature/new-feature
# 4. After review, merge to main
git checkout main
git pull origin main
git merge feature/new-feature
git push origin main
# 5. Delete feature branch
git branch -d feature/new-feature
git push origin --delete feature/new-feature
git reset --soft HEAD~1git log --oneline --graph --all --decorategit cherry-pick <commit-hash>git tag -a v1.0.0 -m "Version 1.0.0"git diff branch1..branch2git commit --amend -m "New message"git show --name-only <commit-hash>Maintains detailed log of errors, bugs, and debugging sessions encountered during development. Use when encountering errors, debugging issues, or solving technical problems. Creates structured ERROR_LOG.md with error details, root causes, solutions, and prevention strategies. Complements project-logger (strategic decisions) with tactical debugging knowledge.
Analyzes completed projects to identify generalizable patterns, common workflows, and reusable knowledge worth extracting into skills. Use after completing a project to review LOG.md, skill updates, and project artifacts. Generates extraction recommendations but does not modify skills directly (user decides whether to apply via skill-updater).
Transforms user project requirements into a structured CLAUDE.md context file. Use when starting a new project and need to document project goals, architecture, technical stack, constraints, and conventions. This skill creates the foundational project context file that other skills and agents will reference throughout the project lifecycle.
Manages project progress tracking and maintains a chronological log of completed tasks, decisions, and updates. Use when completing milestones, making architectural decisions, or documenting project evolution. Creates and updates LOG.md file based on CLAUDE.md context.
Generates evolution contracts for skills, defining what can be updated, what must remain stable, and how to extract knowledge. Use when creating new skills or formalizing update rules for existing skills. Adds a "Skill Contract" section to SKILL.md that guides skill-updater during project work.
Updates skills during project work according to their contracts. Adds references, improves explanations, and refines examples while respecting skill boundaries. Use when discovering patterns, encountering edge cases, or finding better ways to explain skill concepts. Works with skills that have Skill Contracts defined by skill-contract-generator.