chore(plugins): sync generated content mirrors

Regenerate plugins/*/skills/ from plugins/*/.apm/ after the previous
four commits, via scripts/sync-plugin-content.sh --all. The mirror is
generated output (ADR-0017) that check-plugin-content-sync's pre-push
hook diffs against .apm/; nothing here is hand-edited.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EeH8SCbcrCAQrtymkNuhKP

plugins/git/skills/git-branches/SKILL.md

@@ -9,6 +9,7 @@ description: >
   Not a Gitea remote's branches -> `gitea-branches`.
 
 metadata:
+  version: "1.0.0"
   category: git
   source_keys:
     - context7-git-htmldocs
@@ -20,7 +21,7 @@ metadata:
 ## Gotchas
 
 - **Uncommitted changes abort a switch.** `git switch` refuses rather than clobbering conflicting local edits. Offer to stash and retry — forcing the checkout past it is how work disappears.
-- **A branch and a tag can carry the same name.** Detect it before acting — `git branch --list <name>` and `git tag --list <name>`; output from both means the name is ambiguous. Prefer `git switch` over `git checkout`, and where a command accepts either ref, disambiguate with `refs/heads/<name>` or `refs/tags/<name>`.
+- **A branch and a tag can carry the same name.** Detect it before acting — `rtk git branch --list <name>` and `rtk git tag --list <name>`; output from both means the name is ambiguous. Prefer `git switch` over `git checkout`, and where a command accepts either ref, disambiguate with `refs/heads/<name>` or `refs/tags/<name>`.
 - **`main` and `master` are a refusal, not a gate.** Force-pushing, force-deleting, or renaming them is rejected even when the caller passes `confirm: true` — no flag makes the remote's history recoverable. Offer a new branch instead.
 
 ## Step 1 — Determine the branching pattern
@@ -51,7 +52,7 @@ These gates are passable. The `main`/`master` refusal in Gotchas is not.
 
 ## Step 4 — Set tracking
 
-A new branch's first push must be `git push -u origin <branch>`. The push itself is `git-remotes`' — every remote-side gate lives there, which is why Step 2's remote-delete row hands off the same way — but the upstream requirement originates here, so carry it in the handoff. Without an upstream, later pushes and pulls either fail or silently target the wrong remote branch, and the caller has no way to tell which happened.
+A new branch's first push must be `rtk git push -u origin <branch>`. The push itself is `git-remotes`' — every remote-side gate lives there, which is why Step 2's remote-delete row hands off the same way — but the upstream requirement originates here, so carry it in the handoff. Without an upstream, later pushes and pulls either fail or silently target the wrong remote branch, and the caller has no way to tell which happened.
 
 ## Step 5 — Return a structured result
 

plugins/git/skills/git-branches/references/branch-operations.md

@@ -8,21 +8,21 @@ source_keys:
 One command per action. Where two forms exist, the first is the default and the second the escape
 hatch.
 
-- **create** — `git switch -c <branch> <base>`. Base comes from the config's `base_branch`
+- **create** — `rtk git switch -c <branch> <base>`. Base comes from the config's `base_branch`
   (`main` under GitHub Flow, usually `develop` under Gitflow).
-- **switch** — `git switch <branch>` moves to an existing local branch; it aborts rather than
-  clobbering conflicting local changes. `git switch -` returns to the previous branch.
-- **delete (local)** — `git branch -d <branch>` refuses when the branch holds unmerged commits,
-  which is why it is the default. `git branch -D <branch>` forces the deletion and discards that
+- **switch** — `rtk git switch <branch>` moves to an existing local branch; it aborts rather than
+  clobbering conflicting local changes. `rtk git switch -` returns to the previous branch.
+- **delete (local)** — `rtk git branch -d <branch>` refuses when the branch holds unmerged commits,
+  which is why it is the default. `rtk git branch -D <branch>` forces the deletion and discards that
   work — only after the destructive-operation gates pass and `confirm: true` is set.
 - **delete (remote)** — not this skill's. Deleting a remote branch is a push, and every remote-side
   gate lives in `git-remotes`; hand it there rather than running the push from here. Its
   `references/push.md` carries the command and the refspec form.
-- **rename** — `git branch -m <old> <new>`.
-- **list** — `git branch` (local), `-a` (local plus remote-tracking), `-r` (remote-tracking only),
+- **rename** — `rtk git branch -m <old> <new>`.
+- **list** — `rtk git branch` (local), `-a` (local plus remote-tracking), `-r` (remote-tracking only),
   `--merged` / `--no-merged` (filter by merge status into the current branch).
-- **track** — `git branch --set-upstream-to=origin/<branch>` sets an upstream without pushing.
-  `git branch -vv` shows the tracking state of every local branch.
+- **track** — `rtk git branch --set-upstream-to=origin/<branch>` sets an upstream without pushing.
+  `rtk git branch -vv` shows the tracking state of every local branch.
 
 ## get-intent
 
@@ -40,17 +40,17 @@ intent is worse than one built on none.
 A switch aborts rather than clobbering conflicting local changes (see Gotchas). Stash is the way
 past it: it shelves the working tree and index so the branch pointer can move.
 
-- **save** — `git stash push -m "<message>"`. Add `-u` to include untracked files; verified on Git
+- **save** — `rtk git stash push -m "<message>"`. Add `-u` to include untracked files; verified on Git
   2.39.5, a plain `push` leaves them in place, and a plain `push` with *only* untracked changes
   reports `No local changes to save` and stashes nothing. Bare `git stash` is `push` with no message.
-- **restore** — `git stash pop` applies the newest entry and deletes it. `git stash apply stash@{n}`
+- **restore** — `rtk git stash pop` applies the newest entry and deletes it. `rtk git stash apply stash@{n}`
   applies without deleting, for replaying one shelf onto more than one branch.
-- **list** — `git stash list`; `git stash show -p stash@{n}` prints that entry's diff.
-- **drop** — `git stash drop stash@{n}` deletes one entry. `git stash clear` deletes all of them
+- **list** — `rtk git stash list`; `rtk git stash show -p stash@{n}` prints that entry's diff.
+- **drop** — `rtk git stash drop stash@{n}` deletes one entry. `rtk git stash clear` deletes all of them
   and nothing recovers them — confirm before running it.
-- **branch from a stash** — `git stash branch <branch> stash@{n}` creates a branch at the commit the
+- **branch from a stash** — `rtk git stash branch <branch> stash@{n}` creates a branch at the commit the
   stash was taken from and pops it there. Use it when the stash no longer applies to the current tip.
 
 **A conflicting `pop` keeps the entry.** Verified on 2.39.5: it exits 1, writes conflict markers,
 prints "The stash entry is kept in case you need it again", and `git stash list` still shows it.
-Resolve, `git add`, then `git stash drop` the entry by hand — otherwise it silently accumulates.
+Resolve, `rtk git add`, then `rtk git stash drop` the entry by hand — otherwise it silently accumulates.

plugins/git/skills/git-branches/references/comparing-branches.md

@@ -8,9 +8,9 @@ source_keys:
 The two-dot and three-dot forms mean different things and are easy to swap by accident — check the
 direction before reporting a result.
 
-- `git log main..feature` — commits on `feature` that are not on `main`.
-- `git log feature..main` — the reverse direction: commits on `main` not on `feature`.
-- `git log --left-right main...feature` — both diverging sets at once (symmetric difference).
-- `git diff main...feature` — the diff from the common ancestor to `feature`'s tip, which is what
+- `rtk git log main..feature` — commits on `feature` that are not on `main`.
+- `rtk git log feature..main` — the reverse direction: commits on `main` not on `feature`.
+- `rtk git log --left-right main...feature` — both diverging sets at once (symmetric difference).
+- `rtk git diff main...feature` — the diff from the common ancestor to `feature`'s tip, which is what
   a reviewer sees, rather than the diff between the two tips.
-- `git merge-base main feature` — print the common ancestor commit.
+- `rtk git merge-base main feature` — print the common ancestor commit.

plugins/git/skills/git-branches/references/merging.md

@@ -9,22 +9,22 @@ source_keys:
 Scope is fast-forward and merge-commit mechanics plus conflict resolution. Rebase and cherry-pick
 belong to `git-commits`; revert to `git-history`.
 
-- **Fast-forward** — `git merge <branch>` advances the pointer with no merge commit when the
+- **Fast-forward** — `rtk git merge <branch>` advances the pointer with no merge commit when the
   target has not diverged.
-- **True merge** — `git merge --no-ff <branch>` forces a merge commit even when a fast-forward is
+- **True merge** — `rtk git merge --no-ff <branch>` forces a merge commit even when a fast-forward is
   possible. Gitflow requires it on every supporting-branch merge.
-- **Squash merge** — `git merge --squash <branch>` stages the combined diff without committing.
-  Follow it with a `git commit`.
-- **Octopus merge** — `git merge branch-a branch-b branch-c` merges more than two branches at
+- **Squash merge** — `rtk git merge --squash <branch>` stages the combined diff without committing.
+  Follow it with a `rtk git commit`.
+- **Octopus merge** — `rtk git merge branch-a branch-b branch-c` merges more than two branches at
   once, but fails outright on any conflict. Use sequential two-way merges when conflicts are
   likely.
 
 ## Conflict resolution
 
-When Git cannot auto-merge it writes conflict markers and stops mid-merge. Run `git status` to
-list the conflicted files, edit each to resolve its markers, then `git add <file>` and
-`git merge --continue`.
+When Git cannot auto-merge it writes conflict markers and stops mid-merge. Run `rtk git status` to
+list the conflicted files, edit each to resolve its markers, then `rtk git add <file>` and
+`rtk git merge --continue`.
 
-- `git merge --abort` restores the pre-merge state.
-- `git mergetool` opens the configured merge tool.
-- `git diff --diff-filter=U` shows only the still-conflicted files.
+- `rtk git merge --abort` restores the pre-merge state.
+- `rtk git mergetool` opens the configured merge tool.
+- `rtk git diff --diff-filter=U` shows only the still-conflicted files.