Git Workflow

What it does

When your agent uses it

• The user asks about git workflow
• Git workflow best practices
• Needs guidance on git workflow implementation
• The user needs a different specialized skill

Example prompts

• “/git-workflow”

Requirements

• Node.js

Workflow steps

6 steps, taken from the first numbered list in SKILL.md.

1. 1Subject line under 72 characters.
2. 2Use imperative mood: "Add feature" not "Added feature" or "Adds feature".
3. 3Do not end the subject with a period.
4. 4Separate subject from body with a blank line.
5. 5Body explains what and why, not how (the diff shows how).
6. 6Reference issues in the footer.

What it can do on your machine

Read from SKILL.md and the folder at commit 4c030c7. It shows what the files ask for, not the result of running them.

• Tool permissions

  Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

  From allowed-tools in the SKILL.md frontmatter.

• Runs code

  Shell commands in SKILL.md call:

  • git
  • npx

  From the folder's file list and the shell code blocks in SKILL.md.

• Network

  No URLs in SKILL.md. Its commands use git and npx, which can reach the network depending on how they are called.

  From URLs in SKILL.md, links to its own repository left out.

• Credentials

  Names no API keys, tokens, secrets or passwords.

  From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Workflow loads about 3.5k tokens when it runs. Until then it costs about 109 tokens; SKILL.md has 1,052 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it

~109

When it runs · the whole SKILL.md, loaded when a task matches

~3.5k

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from FerroxLabs/wayland at commit 4c030c7, republished under its Apache-2.0 licence (© FerroxLabs). 1,052 words, ~3,513 tokens.

name

git-workflow

description

Git workflow expert covering branching strategies, commit conventions, interactive rebase, merge vs rebase, conflict resolution, git bisect, hooks, monorepo strategies, and CI integration. Use when the user asks about git workflow, git workflow best practices, or needs guidance on git workflow implementation. Do NOT use when the user needs a different specialized skill or is asking about an unrelated technology domain.

license

Apache-2.0

metadata.author

foundry-skills

metadata.version

1.0.0

metadata.tags

best-practices version-control guide

metadata.category

software-engineering

metadata.subcategory

developer-tools

metadata.disclaimer

none

metadata.difficulty

intermediate

main ─────●─────●─────●─────●─────●─────●─────
           \   /       \   /       \   /
            ●           ●           ●
        (short-lived feature branches, < 2 days)

main ─────●─────────●─────────●─────
           \       /           \
            ●──●──●             ●──●
          (feature/xyz)      (fix/abc)
                |
            Pull Request

main ────────●───────────────●───── (releases only)
              \             /
develop ──●──●──●──●──●──●──●──── (integration)
           \     /   \     /
            ●──●      ●──●
         (feature)  (feature)
                              \
                     release/1.0 ──●──●
                                       \
                                    hotfix/1.0.1

<type>(<scope>): <subject>

<body>

<footer>

feat(auth): add OAuth2 login with Google

Implement Google OAuth2 flow using the authorization code grant.
Users can now sign in with their Google accounts.

Closes #234

fix(payments): prevent duplicate charges on retry

The payment service was not checking for existing charges before
retrying, causing duplicate charges when the initial request
timed out but actually succeeded.

Fixes #567

main:    A──B──C────────M──
              \        /
feature:       D──E──F

Before:
main:    A──B──C
              \
feature:       D──E──F

After rebase:
main:    A──B──C
                 \
feature:          D'──E'──F'

git merge --squash feature/xyz
git commit -m "feat(auth): add OAuth2 login"

# Rebase last 4 commits
git rebase -i HEAD~4

pick a1b2c3d feat: add user model
pick e4f5g6h fix: typo in user model
pick i7j8k9l feat: add user controller
pick m0n1o2p fix: missing import in controller

pick a1b2c3d feat: add user model
fixup e4f5g6h fix: typo in user model        # fold into previous, discard message
pick i7j8k9l feat: add user controller
fixup m0n1o2p fix: missing import in controller  # fold into previous

<<<<<<< HEAD
const timeout = 5000;
=======
const timeout = 10000;
>>>>>>> feature/increase-timeout

# Start bisecting
git bisect start

# Mark current commit as bad (has the bug)
git bisect bad

# Mark a known-good commit
git bisect good v1.2.0

# Git checks out the midpoint. Test it.
# If this commit has the bug:
git bisect bad
# If this commit is fine:
git bisect good

# Repeat until the first bad commit is identified
# Git reports: "abc1234 is the first bad commit"

# Return to original state
git bisect reset

# Run a test script at each step
git bisect start HEAD v1.2.0
git bisect run npm test
# Git automatically finds the first commit where tests fail

# Husky (Node.js)
npx husky init
echo "npx lint-staged" > .husky/pre-commit

# pre-commit (Python)
# .pre-commit-config.yaml
repos:
  - repo: [reference URL]
    rev: v4.5.0
    hooks:
      - id: trailing-whitespace
      - id: end-of-file-fixer
      - id: check-yaml
  - repo: [reference URL]
    rev: 24.1.0
    hooks:
      - id: black

{
  "lint-staged": {
    "*.{ts,tsx}": ["eslint --fix", "prettier --write"],
    "*.{css,scss}": ["stylelint --fix", "prettier --write"],
    "*.{json,md}": ["prettier --write"]
  }
}

git sparse-checkout init --cone
git sparse-checkout set packages/my-package packages/shared

git clone --depth 1 --filter=blob:none <url>
# Get more history later if needed
git get --unshallow

# .github/CODEOWNERS
packages/auth/**        @auth-team
packages/payments/**    @payments-team
packages/shared/**      @platform-team
*.md                    @docs-team

# GitHub Actions
on:
  push:
    branches: [main]
  pull_request:
    branches: [main]
    paths-ignore:
      - '**.md'
      - 'docs/**'

# Undo last commit, keep changes staged
git reset --soft HEAD~1

# Undo last commit, keep changes unstaged
git reset HEAD~1

# Recover a deleted branch
git reflog                  # find the commit hash
git checkout -b recovered-branch abc1234

# Recover a dropped stash
git fsck --unreachable | grep commit
git show <hash>

# Undo a pushed merge (creates a revert commit)
git revert -m 1 <merge-commit-hash>

# Who changed this line and when?
git blame -L 10,20 src/auth.ts

# When was a string introduced?
git log -S "secretFunction" --oneline

# What changed between two branches?
git diff main...feature/xyz --stat

# Show the full history of a file, including renames
git log --follow -p -- path/to/file

# Remove branches merged into main
git branch --merged main | grep -v main | xargs git branch -d

# Remove remote tracking branches that no longer exist
git remote prune origin

# Reduce repo size by cleaning up unreachable objects
git gc --aggressive --prune=now

# Git Workflow Analysis

## Context Assessment
[Situation summary and constraints]

## Recommended Approach
[Primary recommendation with rationale]

## Implementation Steps
1. [Step with specific details]
2. [Step with specific details]
3. [Step with specific details]

## Trade-offs and Considerations
- [Key trade-off 1]
- [Key trade-off 2]

## Next Steps
- [Immediate action item]
- [Follow-up action item]

© FerroxLabs, Apache-2.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in src/process/resources/skills-library/bodies/skills/software-engineering/git-workflow of FerroxLabs/wayland.

Open the folder on GitHubat commit 4c030c7