agentsclimarketplace

Git proxy

Skill bmaltais/skills/git-proxy

Install
npx -y skills add bmaltais/skills --skill git-proxy

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

2 things to look at

  • no licenseNo license file was found in the repository. Code published without one is not open source by default, so using it at work is a question for whoever answers licensing questions where you are.
  • 1 stars1 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Safe git operations — commits, pushes, branches, merges, and rebases with safety constraints enforced.

SKILL.md

2.6 KB, 558 tokens by cl100k_base, as published. Nobody here has run it

Git Proxy — all git operations with a safety net

Handle git operations consistently. The fences (constraints above) are enforced by the pre_tool_call hook; this file tells the agent what good behavior looks like within those fences.

Commit

  • Stage specific files, not git add -A (avoids capturing secrets).
  • Write messages that explain why, not what.
  • Reference the task or issue if one exists.

Push

  • Pull before you commit to any shared repo (including skills repos like ~/.copilot/skills, ~/.claude/skills, ~/.hermes/skills). Run git pull --rebase first; if it fails due to unstaged changes, stash first (git stash && git pull --rebase && git stash pop). A push rejection after a commit is much harder to recover from than a pre-commit pull.
  • Run tests first. If tests aren't present, say so explicitly.
  • Never force-push to a protected branch. The pre-call hook will block this even if you try.
  • Prefer --force-with-lease over --force on feature branches.

Diverged branch recovery

When a push is rejected because local and remote have diverged:

  1. Check what you have: git log --oneline origin/HEAD..HEAD (your commits) and git log --oneline HEAD..origin/HEAD (remote-only commits).
  2. If your commits are small and isolated, prefer rebase: git fetch origin && git rebase origin/main. Resolve conflicts, then push.
  3. Do NOT use git reset --hard origin/main to "start over" — if your commits added new tracked files, the hard reset will delete them from the working tree. Use git stash (or copy the files elsewhere) before any hard reset if you need to keep new files.
  4. After a successful rebase/merge, push normally.

Branch / merge / rebase

  • Rebase feature branches on main before opening a PR.
  • Resolve conflicts manually; do not -X theirs or -X ours without thinking.
  • Merge via PR with review, not directly on the command line.

Self-rewrite hook

After every 5 uses, re-read KNOWLEDGE.md and the last 10 git-proxy episodic entries. If a new failure mode has appeared, append a heuristic to KNOWLEDGE.md. If a constraint was violated, escalate to LESSONS.md.

Gives 1 of the 12 instructions most pr commit review skills give in 558 tokens

Counted across 888 of the 1,342 authors here whose files we hold, read 2026-08-07

  • use conventional commits formatin 127 of 888, across 115 files
  • keep subject line under 72 charactersin 62 of 888, across 48 files
  • delete branches after mergein 51 of 888, across 38 files
  • use imperative mood in subject linein 51 of 888, across 42 files
  • use imperative mood in commit messagesin 44 of 888
  • verify directory is ignored before creating worktreein 43 of 888, across 12 files
  • generate a conventional commit messagein 43 of 888
  • add unignored worktree directories to gitignorein 42 of 888, across 10 files
  • make atomic commitsin 39 of 888, across 27 files
  • run tests before committinghere, and in 36 of 888, across 25 files
  • verify clean test baselinein 35 of 888, across 9 files
  • split unrelated changes into separate commitsin 35 of 888, across 30 files

Said here and by no other author read

  • check local and remote commits on push rejection
  • re-read knowledge periodically

Grouped from the skills themselves: near-identical wordings counted once, and counted by distinct author, so one author publishing three of these counts once. Length counted with cl100k_base; the agent that loads this file may tokenize it differently.

Keep looking

Skills are one crate of 328,083. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.