agentleFS
Sign inStart free
frostneyfrostney/knips/.agents/skills/git-workflow/SKILL.md

git-workflow

Skill1 starsChanged 54 days agoMITView on GitHub

Applies the user's git defaults: branch from the remote default, merge rather than rebase for ordinary branches, use native GitHub stacks when selected, never amend, and squash-merge pull requests. Use when branching, syncing, committing, pushing, or merging in the user's repos.

  • Deletes or force-pushes
  • Commits and pushes

We split this skill into the rules it gives an agent

11 rules. 0 are common, 10 are distinctive, and 1 is very specific to this project.

  • 0

    Common

    Most of the 157 edited versions we read keep these.

  • 10

    Distinctive

    This author's own choices. Worth a look.

  • 1

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  • could be automatic: a setting could enforce it
  1. Distinctive:

    When new work starts from the local default branch, inspect status before fetching or editing.

    line 23
  2. Distinctive:

    If that local default worktree is dirty, stop before fetching, updating, or editing and ask the user to choose: discard the state, or …

    line 27
  3. Distinctive:

    Before the first edit in any other newly selected or reused branch or worktree, require a clean worktree and fetch the remote default …

    line 31
  4. Distinctive:

    When entering an existing focused branch or worktree, merge the freshly fetched remote default before editing.

    line 38
  5. Distinctive:

    Stop and report merge conflicts.

    line 41
  6. Distinctive:

    Never amend commits. Add a new commit for every correction.

    line 42
  7. Distinctive:

    Never force-push. Stop if a plain push is rejected by divergent history.

    line 43
  8. Distinctive:

    Use concise Conventional Commit subjects in imperative mood.

    line 45
  9. Very specific:

    Use the official gh stack workflow when the user selects a stack, when work has a real dependency chain, or when a confirmed large issue is …

    line 59
  10. Distinctive:

    Read references/github-stacks.md before creating, syncing, pushing, submitting, reviewing, or merging a stack.

    line 65
  11. Distinctive:

    After a squash merge, sync the local base and remove the merged local branch.

    line 72

“Common” is measured: kept by at least 6 in 10 of the 157 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Git workflow

Apply these defaults unless the user explicitly overrides them in the same turn. A git request authorizes only the repository and GitHub state required for that operation.

  • Resolve the base from the remote default; never hardcode main.
  • Make remote-default synchronization an automatic preflight for new work; do not ask permission to perform a safe clean update.
  • When new work starts from the local default branch, inspect status before fetching or editing. If it is clean, fetch and fast-forward it to the fetched remote-default tip automatically. Stop on local-only commits, divergence, or a non-fast-forward update.
  • If that local default worktree is dirty, stop before fetching, updating, or editing and ask the user to choose: discard the state, or preserve it and create a focused branch/worktree from the latest remote default. Do not make either choice, stash, commit, or discard anything without the answer.
  • Before the first edit in any other newly selected or reused branch or worktree, require a clean worktree and fetch the remote default branch. Stop and report dirty files; never stash, commit, or discard them automatically.
  • Automatically create every new focused local branch and worktree at the exact freshly fetched remote-default tip. Do not configure a focused branch to track the remote default; set its upstream only when pushing that focused branch.
  • When entering an existing focused branch or worktree, merge the freshly fetched remote default before editing.
  • Merge the remote base to update a branch. Never rebase.
  • Stop and report merge conflicts; do not bypass or rewrite them.
  • Never amend commits. Add a new commit for every correction.
  • Never force-push. Stop if a plain push is rejected by divergent history.
  • Stage only relevant files and exclude secrets or unrelated local work.
  • Use concise Conventional Commit subjects in imperative mood. Each commit title must state its observable impact, not only the mechanism changed.
  • Let hooks run unless the user explicitly asks otherwise.
  • Squash-merge pull requests and delete the source branch afterward.
  • Because the merge is a squash, the pull request title becomes the commit subject on the base branch: the branch's own commit subjects do not survive. Give the title a Conventional Commit subject that states the observable impact of the change as a whole. Pick its type from the net effect rather than the most frequent commit under it. Where a project generates its changelog or version bump from commit history, a non-conforming title merges cleanly and is then silently absent from it.

Native GitHub stacks

Use the official gh stack workflow when the user selects a stack, when work has a real dependency chain, or when a confirmed large issue is deliberately split into cumulative, independently reviewable layers. Do not stack unrelated work. Each layer must have one clear claim, a bounded diff, its own validation, and an explicit subset of the requirements.

Read references/github-stacks.md before creating, syncing, pushing, submitting, reviewing, or merging a stack. That reference is the only exception to the merge-only and never-force-push defaults above: rebases and force-with-lease are permitted only when performed by verified gh stack commands against a clean, confirmed native stack. Raw git rebase, git push --force, and manual git push --force-with-lease remain forbidden.

After a squash merge, sync the local base and remove the merged local branch.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

Reviews can't be read right now.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free