Git Ship

Automate the complete git workflow from commit to merged PR.

Commands

When to Use Which

• Standard changes: ship -- commits, pushes, creates PR, waits for CI
• Ready to merge: ship full -- does everything including merge
• Just commit: ship commit -- when not ready to push yet
• Check progress: ship status -- after creating a PR

Prerequisites

• Git repository with remote configured
• GitHub CLI (gh) installed and authenticated
• Feature branch (not main/master)

Usage

# Standard workflow
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh ship

# Full workflow with merge
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh full --merge squash

# With plan reference for better PR descriptions
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh ship --plan plans/my-feature.md

# Custom CI wait time
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh ship --wait 10m

Merge Strategies

# Squash and merge (default, recommended)
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh merge --strategy squash

# Create merge commit
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh merge --strategy merge

# Rebase and merge
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh merge --strategy rebase

# Auto-merge (for repos with branch protection)
bash ${CLAUDE_PLUGIN_ROOT}/skills/git-ship/scripts/ship.sh merge --auto-merge --strategy squash

CI Wait Exit Codes

• 0 -- all checks passed
• 1 -- checks failed
• 2 -- timeout

Integration

• /workflows:work -- used in Phase 4 (Ship It)
• conventional-commits hook -- validates commit format
• pr-comment-resolver agent -- resolves PR feedback
• git-worktree skill -- for parallel development