Canonical commit workflow for Gas Town crew members: pre-flight checks, branch creation, gt commit with agent identity, push, and PR creation. Use when ready to commit and submit work for review.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
A direct command skips the review prompt. Inspect the source before running it.
Canonical commit workflow for Gas Town crew members: pre-flight checks, branch creation, gt commit with agent identity, push, and PR creation. Use when ready to commit and submit work for review.
allowed-tools
Bash(git *), Bash(gt *), Bash(gh *)
version
1.0.0
author
Gas Town
Crew Commit — Canonical Git Workflow
This skill guides crew members through the standard Gas Town commit workflow:
pre-flight → branch → stage → commit → push → PR.
⚠️ NEVER commit directly to main. All crew work goes through branches
and pull requests. The Refinery handles merges to main.
Usage
/crew-commit
Run this when you have changes ready to commit. The skill walks you through
each step in order.
Step 1: Pre-flight Checks
Before touching anything, sync with origin and verify your state.
# Fetch latest from origin
git fetch origin
# Check current branch and status
git status
git branch --show-current
# If you're on main, STOP — create a branch first (Step 2)
If you're behind origin/main, rebase now:
git rebase origin/main
If there are conflicts, resolve them carefully before proceeding.
If stuck on a rebase conflict, stop and get help rather than force-pushing.
Step 2: Create a Feature Branch
If you're already on a feature branch, skip to Step 3.
# Create and switch to feature branch
git checkout -b feat/my-feature-description
# Or use the crew/<name> prefix for crew-specific branches
git checkout -b crew/<your-name>/description
Step 3: Submodule Warning
Check for submodules before staging. Accidentally committing a submodule
pointer change causes cascading failures for other crew members.
# Check if repo has submodulescat .gitmodules 2>/dev/null || echo"(no submodules)"# Check for dirty submodule state
git submodule status 2>/dev/null
Common submodule paths to watch:shared/, config/, vendor/
If you see changes in submodule directories:
Do NOT git add shared/ or git add config/ unless you intentionally
bumped the submodule pointer
Submodule pointer changes should be explicit and deliberate
When in doubt, ask before including submodule changes
Step 4: Stage Your Changes
Prefer staging specific files over git add . or git add -A.
# Review what changed
git diff
git status
# Stage specific files (preferred)
git add src/myfile.go tests/myfile_test.go
# If you need to stage all intentional changes and have verified no secrets:
git add -p # Interactive staging — review each hunk
Before staging, verify:
No .env files, API keys, or credentials
No debug prints or temporary test code
No unrelated changes mixed in
Submodule directories NOT accidentally staged (unless intentional)
Step 5: Commit with gt commit
Use gt commit instead of git commit. It automatically sets the correct
agent identity (name + email) based on your GT_ROLE.
gt commit -m "$(cat <<'EOF'
<type>: <concise description of what and why>
<optional body: context, motivation, or notable details>
EOF
)"
Commit message format:
First line: <type>: <subject> (50 chars or less)
Types: feat, fix, refactor, docs, test, chore
Use imperative mood: "add feature" not "added feature"
Body is optional but valuable for non-obvious changes
Good examples:
feat: add retry logic to webhook delivery
fix: prevent nil pointer when session token expires
docs: clarify crew commit workflow in CONTRIBUTING.md
Step 6: Push Branch to Origin
git push origin <your-branch-name>
# Or, if branch doesn't exist on remote yet:
git push -u origin <your-branch-name>
Step 7: Create Pull Request
gh pr create --title "<type>: <concise description>" \
--body "$(cat <<'EOF'
## Summary
- <what changed and why>
## Test plan
- [ ] <how to verify this works>
## Notes
<any context reviewers need>
🤖 Generated with [Claude Code](https://claude.com/claude-code)
EOF
)"
After creating the PR, note the PR number from the output.
