メニュー
This skill should be used when the user asks to "safe to commit", "check merge strategy", "commit safely", "is it safe to merge", "should I rebase or merge", or wants to verify the git strategy is safe before committing or merging.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Use when the user runs "/insights-audit", asks to "validate the insights report", "audit the report against my projects", "check what the report got wrong", or wants to cross-check an /insights-generated HTML report against actual GitHub repos and local project directories.
This skill should be used when the user asks to "end session", "capture state", "session summary", "what changed this session", "summarize repos", "write session notes", or wants to capture multi-repo state at the end of a work session.
Fill in the Patterns & Surprises section of the latest session reflect file and write the completed review to .ctx/logs/self-review/. Use when the user runs "/self-review", asks to "fill in the reflect", "write the session review", or "what patterns did we hit".
Use when working on the rslm project — Recursive Language Model inference engine in Rust. Triggers on "rslm", "RLM", "recursive language model", "rhai built-ins", "ctx_grep", "ctx_slice", "rlm_call", "rslm-core", "rslm-providers", "rslm-store", or any question about running queries, ingesting documents, or writing Rhai scripts for the RLM loop.
This skill should be used when the user asks to "review this diff", "ai review", "security review my changes", "review before push", "check my code for issues", or wants an LLM-based security and correctness review of uncommitted or unpushed changes.
This skill should be used when the user asks to "generate commit message", "write a commit msg", "ai commit", "generate a conventional commit", "write my commit", or wants an LLM to draft a commit message from the staged diff.
| name | git-guard |
| description | This skill should be used when the user asks to "safe to commit", "check merge strategy", "commit safely", "is it safe to merge", "should I rebase or merge", or wants to verify the git strategy is safe before committing or merging. |
| model | haiku |
| effort | low |
| allowed-tools | ["Bash","Read"] |
Verify git merge/rebase strategy is safe before committing. Detect unsafe rebase candidates, confirm 1Password SSH signing agent is available, and recommend the correct strategy.
Run these checks in order:
git log --oneline --merges main..HEAD
If output is non-empty: the branch contains merge commits. Do NOT rebase. Use merge.
If output is empty: branch has no merge commits. Rebase is safe if desired.
git log --oneline main..HEAD
If empty: branch is fully merged into main. Nothing to do.
If non-empty: list the commits that will be included and confirm with the user.
ssh-add -l 2>/dev/null | grep -i "1password\|agent" || echo "WARNING: 1Password agent may not be running"
If agent not detected: warn user to unlock 1Password before committing.
op account list
If this fails: 1Password is not authed. Commits will fail with signing error.
Present recommendation:
STRATEGY RECOMMENDATION
Branch has merge commits: NO → rebase is safe (but merge also fine)
Branch has merge commits: YES → USE MERGE, do not rebase
Recommended: git merge main (or: git rebase main)
1Password: READY
Never rebase a branch that contains merge commits. Per project convention:
Never rebase branches that contain merge commits. Use
git mergefor conflict resolution unless explicitly told to rebase.
When merge commits are detected, always recommend git merge and refuse to suggest rebase.
Once the user confirms strategy, proceed with the commit:
git add -A && git commit -m "<message>"
If commit fails with 1Password: agent returned an error: instruct user to open and
unlock 1Password, then retry the commit. No config change is needed.
Always run cargo-gate before git-guard on Rust projects:
cargo-gate — validates the build is cleangit-guard — confirms strategy and signs the commitreferences/merge-strategies.md — decision matrix, detached HEAD detection, dirty
working tree handling, 1Password failure recovery, fork-point rebase, squash workflow,
push patterns, branch state summary template