\r \r

Git CLI Skill — How to Work\r

\r Use this skill when the user asks about Git from the command line: what changed, staging/committing, branching, push/pull, stashing, history, tags, merge/rebase, or cloning.\r \r

Your Workflow\r

\r

1. Confirm context: Ensure Git is on PATH and the user is in (or will run commands in) a repo. If unsure, suggest git status or run scripts/is-repo.sh from the skill directory.\r
2. Safety first: Prefer read-only commands (git status, git diff, git log). Do not suggest destructive commands (git reset --hard, git clean -fdx, git push --force) unless the user explicitly asks and understands the risk. For recovery, use git reflog to find a commit before suggesting reset/checkout.\r
3. Give the right level of detail:\r
   • Quick answer: Use the Quick Reference table below and reply with the exact command(s).\r
   • Step-by-step or edge cases: Point to or quote from reference/ (e.g. reference/workflows.md, reference/troubleshooting.md).\r
   • Automation / repeatable checks: Use or adapt scripts in scripts/ and tell the user how to run them.\r
   • Templates (commit message, .gitignore): Use or copy from assets/.\r \r

Quick Reference (use this first)\r

\r | Task | Command |\r |------|--------|\r | State & diff | git status · git diff · git diff --staged · git diff --stat |\r | Stage / unstage | git add \x3Cpath> or git add . · git restore --staged \x3Cpath> |\r | Commit | git commit -m "message" |\r | Branch | git branch · git branch -a · git switch -c new · git switch existing |\r | Sync remote | git fetch · git pull · git push -u origin \x3Cbranch> then git push |\r | Stash | git stash · git stash list · git stash apply / git stash pop |\r | History | git log --oneline --decorate --graph -n 20 · git blame \x3Cfile> |\r | Clone / init | git clone \x3Curl> · git init · git remote add origin \x3Curl> |\r | Remotes | git remote -v · git remote show origin · git branch -vv |\r | Discard (destructive) | git restore \x3Cfile> (working tree) · git restore --staged \x3Cfile> (unstage) |\r | Amend | git commit --amend --no-edit or -m "message" |\r | Tags | git tag · git tag v1.0 · git push origin v1.0 or --tags |\r | Merge / rebase | git merge \x3Cbranch> · git rebase \x3Cbranch> · conflict → fix → git add → git commit or git rebase --continue |\r \r

Where to Look\r

\r | Need | Location |\r |------|----------|\r | Full command list, options, examples | reference/commands.md |\r | Step-by-step workflows (branch, release, conflict) | reference/workflows.md |\r | Errors, recovery, detached HEAD, .gitignore | reference/troubleshooting.md |\r | Run checks (is repo, status summary, branch info) | scripts/ — run from repo root |\r | Commit message or .gitignore template | assets/ |\r \r

Scripts (run from repository root)\r

\r

• scripts/is-repo.sh — Exit 0 if current dir is a Git repo, else 1. Use to confirm context before suggesting commands.\r
• scripts/status-summary.sh — Short status + branch + last commit. Use when user asks "what’s my current state?"\r
• scripts/branch-list.sh — Local and remote branches with upstream. Use when user asks about branches or push target.\r \r On Windows: run in Git Bash or WSL (e.g. bash scripts/status-summary.sh).\r \r

Assets\r

\r

• assets/commit-msg-template.txt — Template for conventional or structured commit messages; suggest when user asks for commit message format.\r
• assets/gitignore-common.txt — Common .gitignore patterns; suggest when user has many untracked files or asks for .gitignore examples.\r \r When the user needs a diagram (e.g. branch/merge flow), describe it in text or point to reference; only create or reference images in assets/ if the user explicitly asks for a visual.\r