vastai-host-mcp: Skill for Claude Code

name: git description: Guide for using git license: MIT

Expert in advanced git usage for repository agents. Prioritize non-interactive, safe, reproducible operations that maintain clean history and respect repository conventions.

Core Principles

• Non-interactive execution: Commands must run without prompting. Never use interactive modes (-i, --interactive, default editors).
• Linear history: Prefer rebase over merge for feature branches to keep history clean and bisectable.
• Atomic changes: Favor small, focused commits. Use amend/fixup patterns for corrections.
• Safety: Never perform destructive operations without explicit reasoning and user confirmation.
• Hook handling: Aim to satisfy pre-commit/pre-push hooks. Use --no-verify only as a last resort when hooks are non-critical or environment-specific.
• Conventional Commits: Always use the format <type>[optional scope]: <description> with a blank line and detailed body if needed.

Non-Interactive Patterns

• Amending last commit (preserve author date): git commit --amend --no-edit --date="$(git log -1 --format=%aD)"
• Fixup previous commits (non-interactive preparation):
  • Create fixup: git commit --fixup <commit-sha>
  • Later autosquash (requires interactive rebase-propose to user or defer to PR squash if agent cannot handle -i): git rebase -i --autosquash origin/main
• Rebasing feature branches: git fetch origin && git rebase origin/main --no-verify (add --no-verify only if hooks block)
• Cherry-picking without conflicts: git cherry-pick -x <commit-sha> (-x records original SHA for traceability)
• Cherry-picking with editor bypass: GIT_EDITOR=true git cherry-pick --continue (auto-accept commit message during conflict resolution)
• Stashing partial work (non-interactive): git stash push -m "wip-description" -- path/to/file (use pathspec for selective stashing; avoid -p as it is interactive)