git-workflow

A set of Git rules for keeping short-lived code branches up to date with the main branch. It requires rebasing, which reapplies your branch's changes on top of the newest main-branch changes, before opening or updating a pull request.

In plain words
What is it for?
Fetching the latest main branch, rebasing before pull requests or updates, resolving conflicts locally, and safely force-pushing rebased branches.
Why use it?
Branches that fall behind main are more likely to cause merge conflicts, duplicate review work, and misleading continuous-integration results.

Cursor rule for Cursor

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add rules/webhook-co/webhook/git-workflow
Clone the repo
git clone --depth 1 https://github.com/webhook-co/webhook

Made for: Cursor.

Per session 438 This file is loaded in full into every session.
When invoked 438 The same file — it is already loaded in full.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00438 $0.00438
Opus 5 $0.00219 $0.00219
Sonnet 5 $0.00088 $0.00088
Haiku 4.5 $0.00044 $0.00044

Measured yesterday against content hash 309a068c5d94, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

git-workflow scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured yesterday.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.cursor/rules/git-workflow.mdc · 38 lines

What it actually says

Git workflow (branch hygiene)

We open many short-lived branches in parallel. They drift from main fast, and stale branches produce avoidable merge conflicts, redundant review of already-merged code, and CI that passed against an old base. Keep every branch close to main.

Rebase on main — non-negotiable

  • Before opening a PR, rebase the branch onto the latest origin/main: git fetch origin && git rebase origin/main. Resolve conflicts locally; never open a PR from a base more than a few commits behind main.
  • Before pushing an update to an open PR (e.g. addressing review), fetch and rebase onto origin/main first, so the PR is reviewed and CI-checked against the current base.
  • Keep rebasing frequently while a branch is open — at minimum whenever another PR merges to main. Don't let a branch sit behind. If several review branches were cut from the same older main, rebase each one as the earlier ones land.

How

  • git fetch origin && git rebase origin/main (interactive rebase flags like -i are unavailable in the agent harness — do a plain rebase).
  • After a rebase that changes already-pushed history, force-with-lease: git push --force-with-lease. Never plain --force.
  • Re-run the gate after every rebase: typecheck, the affected test suites, and lint must pass on the rebased tree before pushing. A clean pre-rebase run does not transfer.

Never weaken the gate

  • Never git commit --no-verify / git push --no-verify. CI required checks are the real gate.
  • Conventional Commits. Branch off main; do not commit directly to main.
  • Don't self-merge — PRs are the human's to merge unless explicitly told otherwise.
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. yesterday First seen · 38 lines · 438 tokens per session scan A 309a068c5d94

Subscribe to this mod's changes

git-workflow is a cursor rule published in the GitHub repository webhook-co/webhook (0 stars, last pushed 6d ago), licensed Apache-2.0. It adds 438 tokens to every session, about $0.0022 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.