# Git Workflow

> 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.

- **Type:** Skill
- **Install:** `agentstack add skill-futurejj-claude-skills-git-workflow`
- **Verified:** Yes — security-reviewed for prompt injection and unsafe behavior
- **Seller:** [FutureJJ](https://agentstack.voostack.com/s/futurejj)
- **Installs:** 0
- **Category:** [Agent Skills](https://agentstack.voostack.com/c/agent-skills)
- **Latest version:** 0.1.0
- **License:** MIT
- **Upstream author:** [FutureJJ](https://github.com/FutureJJ)
- **Source:** https://github.com/FutureJJ/claude-skills/tree/main/skills/git-workflow

## Install

```sh
agentstack add skill-futurejj-claude-skills-git-workflow
```

Requires the [AgentStack CLI](https://agentstack.voostack.com/docs/cli). Works with Claude Code, Cursor, and any MCP-compatible agent.

## About

# 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 |

## Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

- **Author:** [FutureJJ](https://github.com/FutureJJ)
- **Source:** [FutureJJ/claude-skills](https://github.com/FutureJJ/claude-skills)
- **License:** MIT

Install and usage instructions live in the source repository linked above.

## Pricing

- **Free** — Free

## Security capabilities

Automated source analysis of v0.1.0 — what this tool can access:

- **Network access:** no
- **Filesystem access:** no
- **Shell / process execution:** no
- **Environment & secrets:** no
- **Dynamic code execution:** no

*"Yes" means the capability is present in the source — more access means more to trust, not that it is unsafe.*


## Versions

- **0.1.0** — security scan: passed — Imported from the upstream source.

## Links

- Listing page: https://agentstack.voostack.com/l/skill-futurejj-claude-skills-git-workflow
- Seller: https://agentstack.voostack.com/s/futurejj
- Browse the marketplace: https://agentstack.voostack.com/browse

---
Listed on AgentStack — the marketplace for AI agent skills and MCP servers. Every listing is security-reviewed. Creators keep 70%.