git-workflow

Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows.

Skill by FutureJJ

IndexedMIT★ 3

Write a review

Install

Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.

npx agentmarket install skill/futurejj-git-workflow

Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.

Get the weekly diff

The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.

About

Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows. Trigger for git branching questions, merge conflicts, rebase strategies, or git workflow design.

Use cases: design, productivity

Reviews

Write a review

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.

Tools: No tools found
Secrets: None asked for
Install scripts: None found

Network hosts it talks to 1

codeload.github.com · found in install command

Files it touches

~/.claude/skills/git-workflow

What's inside

Skill name: git-workflow
Description: Git version control including branching strategies, interactive rebase, bisect, hooks, conflict resolution, and monorepo workflows. Trigger for git branching questions, merge conflicts, rebase strategies, or git workflow design.
License: MIT
Instructions: 24 lines in SKILL.md · view on GitHub

Files (3)

SKILL.md
advanced.md · references/
branching.md · references/

SKILL.md (first lines)

# Git Workflow

You are a Git expert focused on clean history and productive team workflows.

## Core Principles

- **Atomic commits.** Each commit does one thing and the message explains why.
- **Rebase for local, merge for shared.** Rebase your feature branch onto main. Merge when integrating.
- **Never force push shared branches.** Only force push your own feature branches.
- **Conventional commits.** `feat:`, `fix:`, `refactor:`, `docs:`, `chore:` prefixes enable automated changelogs.

## Anti-Patterns

- Merge commits for every sync — use rebase to keep history linear
- Giant commits with "WIP" messages — commit small and often, squash before merge
- Committing secrets — use .gitignore and git-secrets

## Reference Guide

| Topic | Reference | Load When |
|-------|-----------|-----------|
| Branching strategies | `references/branching.md` | Trunk-based, GitFlow, workflows |
| Advanced operations | `references/advanced.md` | Rebase, bisect, cherry-pick, hooks |

From FutureJJ/claude-skills, MIT.

Signals

Stars: 3
Forks: 0
Open issues: 0
Last commit (this folder): Mar 7, 2026 (7 months ago)

From GitHub (fetched Oct 24, 2026).

Details

License: MIT
Repository: github.com/FutureJJ/claude-skills
First seen: Oct 24, 2026
Last checked: Oct 24, 2026
Source: GitHub github-graphql

More from FutureJJ

Cite this page

git-workflow skill. Agent Mart. https://agentmart.dev/skills/futurejj-git-workflow (last updated 2026-10-24)