agentleFS
Sign inStart free
cobusgreylingcobusgreyling/grok-build-arsenal/skills/git-discipline/SKILL.md

git-discipline

Skill6 starsChanged 5 months agoMITView on GitHub

Enforce conventional commits, clean branch strategy, small focused diffs, and PR-ready history. Use before any commit or when preparing work for review. Triggers: "commit this cleanly", "prepare for PR", "fix the git history", "use git-discipline".

13 other projects use a version of this.

Adopted by

Most recently taken up by

The file

We split this skill into the rules it gives an agent

6 rules. 0 are common, 6 are distinctive, and 0 are very specific to this project.

  • 0

    Common

    Most of the 11 edited versions we read keep these.

  • 6

    Distinctive

    This author's own choices. Worth a look.

  • 0

    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:

    Never let agentic speed destroy repository hygiene.

    line 13
  2. Distinctive:

    Rebase or merge cleanly: before opening PR.

    line 24
  3. Distinctive:

    PR description: should reference the plan or relevant skills used.

    line 25
  4. Distinctive:

    After edits, offer to run git diff --staged and propose a commit.

    line 29
  5. Distinctive:

    If history is messy, propose a rebase plan (never force-push without confirmation).

    line 30
  6. Distinctive:

    When multiple logical changes are staged together, split them.

    line 31

“Common” is measured: kept by at least 6 in 10 of the 11 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 Discipline

Never let agentic speed destroy repository hygiene.

Mandatory Steps

  1. Stage intentionally — only the files that belong in this logical change.
  2. Write a Conventional Commit message:
    • feat:, fix:, refactor:, docs:, test:, chore:, perf:
    • Scope when useful: feat(api): ...
    • Body that explains why, not just what.
  3. Create or update branch following feature/, fix/, etc.
  4. Never commit directly to main.
  5. Rebase or merge cleanly before opening PR.
  6. PR description should reference the plan or relevant skills used.

Agent Behavior

  • After edits, offer to run git diff --staged and propose a commit.
  • If history is messy, propose a rebase plan (never force-push without confirmation).
  • When multiple logical changes are staged together, split them.

Verification

  • git log --oneline -10 should tell a clear story.
  • Each commit should be buildable/testable in isolation where practical.

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.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

  • It worked
  • Partly
  • It didn't
What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

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