# Commit > Guide the commit process following Marty conventions - conventional commits, branch strategy, and PR workflow. Make sure to use this skill whenever the user asks to commit, make a commit, create a commit message, push changes, stage files, or run any git commit-related command. Also use it when the user says things like "commit this", "I need to push my changes", "stage my files", or "what should my commit message say?". This skill is especially useful when the user is unsure about format, branch naming, or how to structure their commit message. - Skill: `nesalia-inc/commit` (Agent Skill) - Install (CLI): `npx skillmds@latest add nesalia-inc/commit` - Raw SKILL.md: https://api.skillmd.com/api/skills/nesalia-inc/commit/raw - Safety review: pending - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Productivity - Author: nesalia-inc (https://skillmd.com/u/nesalia-inc) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/nesalia-inc/commit --- # Commit Process Guide (Non-Interactive) Follow this guide to make commits that integrate with Marty's workflow and changelog system. All operations are command-line only — no interactive editors. ## Commit Message Format All commits MUST use **Conventional Commits** format: ``` (): Co-Authored-By: martyy-code ``` ### Type Categories | Type | When to Use | Appears in Changelog | |------|-------------|---------------------| | `feat` | New feature | Yes (Features section) | | `fix` | Bug fix | Yes (Bug Fixes section) | | `docs` | Documentation changes | Yes (Documentation section) | | `refactor` | Code refactoring | Yes (Code Refactoring section) | | `perf` | Performance improvement | Yes (Performance Improvements section) | | `test` | Adding or updating tests | No | | `chore` | Maintenance, tooling | No | | `style` | Formatting, no code change | No | | `ci` | CI/CD changes | No | ### Scope (Optional but Recommended) **Approved scopes**: `skills`, `docs`, `ci`, `agents`, `auth`, `api`, `cli`, `config`, `deps`, `other` If your change doesn't fit, omit the scope. ### Description Rules - Use imperative mood: "add" not "added" or "adds" - Lowercase first letter, no period at end - Under 72 characters ## Branch Strategy ### When to Create a Branch | Change Type | Branch Required? | |-------------|-------------------| | Hotfix (1-liner, trivial) | No — commit directly on main | | Bug fix (non-trivial) | Yes | | Small/Large feature | Yes | | Refactor (major) | Yes | | Docs only | Yes | ### Branch Naming ``` / ``` ## Non-Interactive Commit Workflow ### Full Workflow (Single Command) ```bash # Complete workflow: create branch, commit, push git checkout -b feat/my-feature && git add -A && git commit -m "feat(scope): description Co-Authored-By: \${GIT_AUTHOR_EMAIL:-martyy-code }" && git push -u origin HEAD ``` ### Step-by-Step Commands **1. Create branch:** ```bash git checkout -b / ``` **2. Stage all changes:** ```bash git add -A ``` **3. Commit (single line, no editor):** ```bash git commit -m "feat(skills): add new feature Co-Authored-By: martyy-code " ``` **4. Push:** ```bash git push -u origin HEAD ``` ### Quick Commit Template Copy this pattern: ```bash git commit -m "(): Co-Authored-By: martyy-code " ``` ## Fixup (Non-Interactive) After push, use `--fixup` for clean history without interactive rebase: ```bash # Mark as fixup of a specific commit git commit --fixup= -m "fix(scope): correct issue Co-Authored-By: martyy-code " # Later, autosquash all fixups git rebase -i --autosquash HEAD~N ``` **Note**: For automated workflows, prefer direct commits over fixup to avoid interactive rebase. ## Amend (Non-Interactive) ```bash # Amend last commit message or add forgotten changes git add -A && git commit --amend --no-edit ``` **Warning**: Only amend commits that haven't been pushed to shared branches. ## Stashing (Switching Contexts) If you need to switch branches or set aside changes temporarily: ```bash # Save work in progress git stash push -m "work in progress on feature X" # Later, restore work git stash pop # List stashes git stash list ``` ## When Nothing to Commit If `git status` shows no changes: - Verify with `git diff` (untracked files won't show here) - Use `git log --oneline -3` to confirm you're on the right branch - If files are untracked, you need to `git add` them first before committing ## Breaking Changes ```bash git commit -m "feat(auth)!: change token format BREAKING CHANGE: Token payload structure changed. Users must re-authenticate. Co-Authored-By: martyy-code " ``` ## Commit Message Examples **Feature:** ```bash git commit -m "feat(auth): add refresh token rotation - Supports staging and production targets - Runs pre-deployment checks - Creates deployment PR for review Closes #45 Co-Authored-By: martyy-code " ``` **Bug Fix:** ```bash git commit -m "fix(auth): correct token refresh race condition When multiple requests hit the token refresh endpoint simultaneously, only one was being processed. Now uses mutex lock to ensure single refresh. Fixes #123 Co-Authored-By: martyy-code " ``` **Refactor:** ```bash git commit -m "refactor(agents): extract memory module Extracted memory persistence logic to separate module for: - Easier testing - Reusability across agents - Clearer separation of concerns No functional changes. Co-Authored-By: martyy-code " ``` **Chore:** ```bash git commit -m "chore(deps): update dependencies to latest versions Co-Authored-By: martyy-code " ``` ## Common Mistakes to Avoid 1. **No interactive editors**: Always use `-m` flag, never let git open an editor 2. **Missing Co-Authored-By**: Every commit MUST include it 3. **Wrong type**: Don't use `feat` for chore work 4. **Vague messages**: "update", "fix bug" are not acceptable 5. **Missing reference**: Link to issue/RFC in footer ## Pre-Commit Validation Before committing, run: ```bash # Check current state git status # View diff of staged changes git diff --cached ``` ## Quick Reference ``` Format: git commit -m "(): Co-Authored-By: martyy-code " Types: feat | fix | docs | refactor | perf | test | chore | style | ci Scopes: skills | docs | ci | agents | auth | api | cli | config | deps | other Example: git commit -m "feat(auth): add OAuth2 support Co-Authored-By: martyy-code " ``` ## Integration with Changelog Commits using conventional format are automatically parsed by the changelog GitHub Action on merge to main. Write clear, conventional commits — the automated system handles CHANGELOG.md.