Local git operations for syncing, branching, merging, and conflict resolution
Local git operations for syncing, branching, merging, and conflict resolution
npx skills add https://github.com/dtsong/claude-code-wsl-setup --skill git-workflows复制此命令并粘贴到 Claude Code 中以安装该技能
GitHub interactions for issues, PRs, releases, and repository management
Use this skill when performing hardware security analysis for System-on-Chip components — threat modeling, verification scaffolding, compliance mapping, executive briefing, microarchitectural attack analysis, physical side-channel assessment, kernel security analysis, emerging hardware security, or TLA+ formal specification. Routes to the appropriate specialist. Trigger phrases include "threat model my SoC", "run STRIDE analysis", "generate SVA assertions", "compliance check against FIPS", "executive summary of findings", "Spectre analysis for cache", "DPA attack assessment", "kernel hardening review", "PQC hardware review", "TLA+ spec for access control". Do NOT use for software-only security, network security, or web application security.
Use when working with Terraform or OpenTofu - creating modules, writing tests (native test framework, Terratest), setting up CI/CD pipelines, reviewing configurations, choosing between testing approaches, debugging state issues, implementing security scanning (trivy, checkov), or making infrastructure-as-code architecture decisions
Use this skill when scoring or comparing a generated diagram against a human reference. Triggers on "score this diagram", "evaluate my diagram", "compare to reference", or "how accurate is this". Applies when both a generated diagram and a reference image exist and quality assessment is needed. Do NOT use for creating new diagrams (use generate-diagram) or plotting data (use generate-plot).
Use this skill when creating a methodology diagram from research text. Triggers on "make a diagram", "visualize this methodology", "diagram this process", or "generate a figure from this paper". Applies to methodology descriptions, process flows, and research paper sections. Do NOT use for scoring existing diagrams (use evaluate-diagram) or plotting data from CSV/JSON (use generate-plot).
Use this skill when creating a statistical plot or chart from a data file. Triggers on "plot this data", "make a chart", "graph this CSV", or "visualize these results". Applies to CSV, JSON, or tabular data needing bar charts, scatter plots, line graphs, or similar visualizations. Do NOT use for methodology diagrams from text (use generate-diagram) or diagram scoring (use evaluate-diagram).
| name | Git Workflows |
| description | Local git operations for syncing, branching, merging, and conflict resolution |
| triggers | ["git workflow","git help","git operations"] |
| user_invocable | true |
A comprehensive suite of git workflow skills for local repository operations.
.., shell metacharacters, or null bytes.. traversal, null bytes, and shell metacharacters| Skill | Purpose | Invoke |
|---|---|---|
/git-sync | Fetch and show remote changes | git sync, what's new upstream |
/git-pull | Pull with merge/rebase strategy | git pull, get latest |
/git-push | Push with upstream handling | git push, push changes |
| Skill | Purpose | Invoke |
|---|---|---|
/git-stash | Save/pop/list stashed changes | git stash, save my work |
| Skill | Purpose | Invoke |
|---|---|---|
/git-branch | Create branches with naming conventions | git branch, new branch |
/git-switch | Switch branches safely | git switch, checkout branch |
/git-branches | List and visualize branch status | git branches, list branches |
/git-delete-branch | Delete local/remote with safety | delete branch, cleanup branch |
| Skill | Purpose | Invoke |
|---|---|---|
/git-merge-main | Merge main into feature branch | merge main, update from main |
/git-rebase | Rebase onto main with guidance | git rebase, rebase onto main |
/git-squash | Squash commits non-interactively | git squash, clean up commits |
| Skill | Purpose | Invoke |
|---|---|---|
/git-abort | Abort failed merge/rebase/cherry-pick | git abort, cancel merge |
/git-conflicts | Guided conflict resolution | git conflicts, fix conflicts |
# Sync workflow
/git-sync # See what's new
/git-pull # Get changes
/git-push # Push changes
# Branch workflow
/git-branch feat/xyz # Create branch
/git-switch main # Switch branch
/git-branches # See all branches
# Integration
/git-merge-main # Update from main
/git-rebase # Rebase on main
/git-squash # Clean up history
git rebase -i) requires a TTY and fails in Claude Code — use git rebase (non-interactive) or git rebase --ontogit checkout is ambiguous (branches vs files) — prefer git switch for branches, git restore for files--force) to protected branches is rejected by most remotes — use --force-with-lease which fails if remote has new commitsgit stash doesn't stash untracked files — use git stash -u to include untrackedgit pull with diverged branches creates merge commits — use git pull --rebase or git pull --ff-only to avoid surprise mergesgit add . stages everything including .env files and secrets — always use git add <specific-files> or check git status first/commit - Create commits with conventional messages/commit-push-pr - Full commit, push, and PR workflow/gh-pr-* - GitHub PR operations