refactor(git-commits): retrofit to the ADR-0020 context contract

Description 724 -> 214 chars, body 1102 -> 343 words, Gotchas 12 -> 3.
Create, rewrite, and cherry-pick flows move to self-contained references/
files behind a dispatch table.

The audit caught that moving the secret scan into the create flow left the
amend/squash path with no check in its loaded context; it is now a gate
common to every flow. Also re-homes the interactive-rebase reflog warning
git-history dropped, since this skill owns rebase.

plugins/git/skills/git-commits/references/cherry-pick.md

@@ -0,0 +1,12 @@
+---
+source_keys:
+  - context7-git-htmldocs
+---
+
+# Cherry-picking a commit
+
+1. **Identify the source commit** — a hash or a branch reference.
+2. **Confirm the destination** — cherry-pick replays onto the branch currently checked out, so verify that is the intended branch before running anything.
+3. **Execute** — `rtk git cherry-pick <commit-hash>`. A range is `<a>..<b>` (exclusive of `<a>`) or `<a>^..<b>` (inclusive); `-n` stages without committing, for when the replay needs editing first.
+4. **Handle conflicts** — if the replay halts, offer resolution or `rtk git cherry-pick --abort`. Never resolve automatically without confirmation.
+5. **Report the outcome** — which commits replayed, which conflicted, and which were rejected.

plugins/git/skills/git-commits/references/commit-template.md

@@ -7,7 +7,7 @@ source_keys:
 
 Use this structure for the body/footer of any non-trivial commit (skip sections that don't apply — do not leave placeholders in the actual commit).
 
-```
+```text
 <type>(<scope>): <concise summary>
 ```
 The header is required. Describe the intended outcome, not the implementation.
@@ -53,7 +53,7 @@ Omit if there are no noteworthy impacts.
 
 Structured metadata for traceability and tooling. Use only the trailers that apply:
 
-```
+```text
 Fixes:
 Refs:
 ADR:

plugins/git/skills/git-commits/references/conventional-commits-spec.md

@@ -10,7 +10,7 @@ Conventional Commits is a lightweight convention on top of commit messages that
 
 ## Message Format
 
-```
+```text
 <type>[optional scope]: <description>
 
 [optional body]
@@ -58,20 +58,20 @@ A `BREAKING CHANGE` footer or `!` on **any** type always triggers a MAJOR bump.
 Two equivalent notations:
 
 **`!` in header** (preferred — visible in `git log --oneline`):
-```
+```text
 feat!: drop support for Node 6
 feat(api)!: remove deprecated endpoint
 ```
 
 **`BREAKING CHANGE` footer** (machine-readable body):
-```
+```text
 feat: allow config to extend other configs
 
 BREAKING CHANGE: `extends` key now used for extending config files
 ```
 
 **Both together** (most explicit):
-```
+```text
 feat!: drop support for Node 6
 
 BREAKING CHANGE: use JavaScript features not available in Node 6.
@@ -85,7 +85,7 @@ Rules:
 
 ## Footer Token Rules
 
-```
+```text
 <token>: <value>
 <token> #<value>    # for issue references
 ```
@@ -96,7 +96,7 @@ Rules:
 - Blank line required before the footer block.
 
 Valid footer examples:
-```
+```text
 Reviewed-by: Z
 Refs: #123
 Co-authored-by: Alice <alice@example.com>
@@ -106,29 +106,29 @@ BREAKING CHANGE: the `--format` flag now requires a value
 ## Examples
 
 Minimal — no body, no footer:
-```
+```text
 docs: correct spelling of CHANGELOG
 ```
 
 With scope:
-```
+```text
 feat(lang): add Polish language
 ```
 
 Breaking change via `!`:
-```
+```text
 feat!: send an email to the customer when a product is shipped
 ```
 
 Breaking change via footer:
-```
+```text
 feat: allow provided config object to extend other configs
 
 BREAKING CHANGE: `extends` key in config file is now used for extending other config files
 ```
 
 Multi-paragraph body with multiple footers:
-```
+```text
 fix: prevent racing of requests
 
 Introduce a request id and a reference to latest request. Dismiss
@@ -142,7 +142,7 @@ Refs: #123
 ```
 
 Revert:
-```
+```text
 revert: let us never again speak of the noodle incident
 
 Refs: 676104e, a215868

plugins/git/skills/git-commits/references/create-commit.md

@@ -0,0 +1,17 @@
+---
+source_keys:
+  - conventional-commits-spec
+  - commitlint-config-conventional
+  - org-commit-conventions
+---
+
+# Creating a new commit
+
+1. **Gather context** — what changed and why, from the staged diff, the PR description, or the issue. Confirm the staged diff is one logical, independently reviewable and reversible change that leaves the repository buildable and testable. If it bundles unrelated work, suggest splitting it before going further.
+2. **Determine the type** — read it off the change itself: a new user-visible feature is `feat`, a bug fix is `fix`. For the full 11-type set and each type's SemVer impact, read `references/conventional-commits-spec.md`.
+3. **Determine the scope** — use the scope from plugin config where one is set, otherwise infer it from the files changed (`api`, `db`, `cli`, `config`). Scope is optional, but it identifies which part of the system moved and is worth setting.
+4. **Write the description** — imperative mood, no trailing period: "add user authentication", "fix race condition in cache". Neither source spec sets a target below the 100-character header maximum, but convention favours roughly 50 characters so `git log --oneline` stays readable.
+5. **Add a body when the change is non-trivial** — blank line first, wrapped at 100 characters. Explain *why*, not what: the diff already shows what changed, and the message's job is the context the diff cannot carry — motivation, root cause, tradeoffs. Follow the Why / Implementation Notes / Impact structure in `references/commit-template.md`.
+6. **Add footers where they apply** — `Fixes: #123`, `Refs: #123`, `ADR: 0012`, `Co-authored-by: Name <email>`, `BREAKING CHANGE: description`. For the full trailer list, read `references/commit-template.md`.
+7. **Signal a breaking change with `!` before the colon** — `feat!: drop Node 6` is visible in `git log --oneline`, where the `BREAKING CHANGE:` footer alone is machine-readable but hidden. Use both when the break needs describing.
+8. **Validate, confirm, execute** — check header length, type, lowercase subject and trailing period against commitlint, show the message, and commit only once the caller has approved. Never add `--no-verify`.

plugins/git/skills/git-commits/references/rewrite-history.md

@@ -0,0 +1,37 @@
+---
+source_keys:
+  - org-commit-conventions
+  - context7-git-htmldocs
+---
+
+# Rewriting existing commits
+
+Every flow on this page rewrites history. None of them runs before the caller has explicitly approved it, and none is followed by a force-push to `main`/`master` — refuse that and explain why instead.
+
+## Amend the last commit
+
+1. Stage the new changes, or the changes that undo something.
+2. Run `rtk git commit --amend`, adding `--no-edit` when the message stays as it is.
+3. If the message should change, show the current one and prompt for the replacement.
+4. The branch has now diverged from its remote. Amending is safe only on a branch nobody else has based work on; on `main`/`master`, refuse the force-push and explain, rather than warning and proceeding.
+
+## Fold a commit into an earlier one (autosquash — preferred)
+
+Prefer this whenever a commit is written to be folded, because git does the marking:
+
+1. `rtk git commit --fixup=<commit>` keeps the target's message; `rtk git commit --squash=<commit>` lets you edit the combined message later. Both prefix the message with `fixup!`/`squash!` and name the target commit.
+2. Get explicit approval — the rebase still rewrites history.
+3. Run `rtk git rebase --autosquash HEAD~N`, or `-i --autosquash` to review the plan first. Git reorders the tagged commits against their targets automatically.
+
+## Squash by hand (interactive rebase)
+
+Use this when the commits were not tagged at commit time. **Interactive rebase has no undo once `rebase -i` starts — `git reflog` is the recovery path.**
+
+1. Identify the commits to squash — typically the last N on the current branch.
+2. Get explicit approval.
+3. Run `rtk git rebase -i HEAD~N`, marking the older commits `squash` to keep their messages for editing, or `fixup` to discard them.
+4. Compose the combined message when the rebase stops to ask. For a non-trivial combined message, follow the structure in `references/commit-template.md`.
+
+## When a rebase halts on a conflict
+
+Offer conflict resolution or `rtk git rebase --abort`. Do not resolve conflicts automatically without confirmation.

plugins/git/skills/git-commits/references/sources.md

@@ -7,34 +7,34 @@ source_keys:
   - context7-git-htmldocs
 ---
 
-# Research Sources for git:commits Skill
+# Research Sources for git-commits Skill
 
-Sources extracted from the git plugin research phase. Only sources that directly informed this skill are listed; sibling skills (git:branches, git:history, git:remotes, etc.) have their own sources.md.
+Sources extracted from the git plugin research phase. Only sources that directly informed this skill are listed; sibling skills (git-branches, git-history, git-remotes, etc.) have their own sources.md.
 
 ## conventional-commits-spec
 
 - **Description:** Conventional Commits Specification (v1.0.0) — message format, types, breaking changes, footer rules
 - **Research doc:** plugins/git/docs/research/docs/git/commits.md § "Conventional Commits Specification (v1.0.0)"
-- **Contributing files:** SKILL.md, references/conventional-commits-spec.md
+- **Contributing files:** SKILL.md, references/conventional-commits-spec.md, references/create-commit.md
 - **Status:** extracted
 
 ## commitlint-config-conventional
 
 - **Description:** commitlint config-conventional preset — validation constraints (max 100 chars header, no trailing periods, lowercase type, 11-type set enforcement)
 - **Research doc:** plugins/git/docs/research/docs/git/commits.md § "commitlint Constraints (`config-conventional`)"
-- **Contributing files:** SKILL.md, references/conventional-commits-spec.md
+- **Contributing files:** SKILL.md, references/conventional-commits-spec.md, references/create-commit.md
 - **Status:** extracted
 
 ## org-commit-conventions
 
 - **Description:** Organization commit message body template and git conventions (atomic commits, no `--no-verify`, no force-push main/master, `rtk git` wrapper) — content fully embedded in this skill; the org's `core/instructions/git.md` and `core/instructions/commits.md` are provenance only and are not a live dependency
 - **Research doc:** core/instructions/commits.md, core/instructions/git.md (org convention, not part of the plugin's research corpus)
-- **Contributing files:** SKILL.md, references/commit-template.md
+- **Contributing files:** SKILL.md, references/commit-template.md, references/create-commit.md, references/rewrite-history.md
 - **Status:** extracted
 
 ## context7-git-htmldocs
 
-- **Description:** Official Git HTML documentation — `git commit --squash`/`--fixup` and `git rebase --autosquash` flag semantics
-- **Research doc:** plugins/git/docs/research/docs/git/cli-reference.md
-- **Contributing files:** SKILL.md
+- **Description:** Official Git HTML documentation — `git commit --squash`/`--fixup`, `git rebase --autosquash`, and `git cherry-pick` range and abort semantics
+- **Research doc:** plugins/git/docs/research/docs/git/cli-reference.md § "Committing", § "Rebasing", § "Cherry-picking"
+- **Contributing files:** SKILL.md, references/rewrite-history.md, references/cherry-pick.md
 - **Status:** extracted