git-edit-commit
Use when needing to fixup, squash, drop, reword, reorder, or edit commits in a branch's history. Handles the non-interactive approach agents need since `git rebase -i` requires a TTY.
What this skill does
# Git Edit Commit This skill outlines how agents can edit previous commits. Agents can't use `git rebase -i` directly, which requires a TTY. This skill provides helper scripts instead. REQUIRED: Always reference commits by SHA, not by HEAD-relative notation like `HEAD~3`. ## Inspect Commits First Run `git log --oneline` to get SHAs. Output is newest-first; the rebase plan is oldest-first. ## Amending the Latest Commit To fold staged changes into the most recent commit without changing its message: ```bash git add <files> git commit --amend --no-edit ``` ## Fixup and Squash (Recommended Shortcut) ```bash git commit --fixup=<target-sha> # merge into target, discard message git commit --squash=<target-sha> # merge into target, combine messages # <oldest-sha-in-scope>^ is the parent of the oldest commit in scope; use --root if it's the first commit scripts/non-interactive-git-rebase.sh --autosquash <oldest-sha-in-scope>^ ``` ## Drop, Reorder, Edit Use `scripts/non-interactive-git-rebase.sh`. Supply the plan via stdin. Use `--root` when the oldest commit in scope is the repository's first commit. ```bash scripts/non-interactive-git-rebase.sh <oldest-sha-in-scope>^ <<'PLAN' pick abc1234 Keep this commit squash def5678 Merge this into the previous drop ghi9012 Remove this commit entirely PLAN ``` ### Edit Mark the commit `edit` in the plan. Git pauses there. Then: ```bash git add <files> git commit --amend --no-edit git rebase --continue ``` ## Reword ```bash scripts/reword-commit.sh --sha <sha> --message "New commit message" ``` ## Rationalizations | Thought | Reality | | ------------------------------------------------- | ---------------------------------------------------------------- | | "I can't do interactive rebase without a TTY" | Use `scripts/non-interactive-git-rebase.sh` instead | | "I'll use HEAD~N as the upstream" | Use a SHA — HEAD~N is fragile and ambiguous | | "I'll just --amend instead" (for an older commit) | `--amend` only works on the latest commit; use rebase for others | | "I'll undo the commits and redo them one by one" | Rebase rewrites history in one step — no need to redo commits | | "I'll create a new commit to fix it" | That pollutes history; rebase is the right tool |
Related in General
modeling-omnistudio-epc-catalog
IncludedSalesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).
relationship-science-coach
IncludedUse this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.
building-sf-integrations
IncludedSalesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).
venue-templates
IncludedAccess comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.
let-fate-decide
IncludedDraws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.
net-ops
IncludedCross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.