Git is a distributed version control system that tracks changes to files and supports collaboration across teams.

What is the difference between Working Directory, Staging Area, Local Repository, and Remote Repository?

The Working Directory holds current files, the Staging Area holds changes prepared for commit, the Local Repository stores commits, and the Remote Repository is a shared copy hosted on a server that teammates pull from and push to.

How can I recover accidentally lost commits?

Use git reflog to locate the previous state, then reset or checkout to a known good commit as needed.

git

skill

npx machina-cli add skill Fujigo-Software/f5-framework-claude/git --openclaw

Files (1)

SKILL.md

7.8 KB

Git Skills

Overview

Git version control knowledge for effective code management and team collaboration. From basic operations to advanced techniques and workflow strategies.

Git Workflow

┌─────────────────────────────────────────────────────────────────┐
│                      Git Data Flow                               │
├─────────────────────────────────────────────────────────────────┤
│                                                                  │
│  Working       Staging        Local          Remote              │
│  Directory     Area           Repository     Repository          │
│  ┌───────┐    ┌───────┐      ┌───────┐      ┌───────┐           │
│  │       │    │       │      │       │      │       │           │
│  │ Files │───▶│Staged │─────▶│Commits│─────▶│Origin │           │
│  │       │add │       │commit│       │ push │       │           │
│  └───────┘    └───────┘      └───────┘      └───────┘           │
│      ▲                           │              │                │
│      │                           │              │                │
│      └───────────────────────────┴──────────────┘                │
│                checkout / pull / fetch                           │
│                                                                  │
└─────────────────────────────────────────────────────────────────┘

Git Object Model

┌─────────────────────────────────────────────────────────────────┐
│                    Git Object Types                              │
├─────────────────────────────────────────────────────────────────┤
│                                                                  │
│  ┌─────────┐     ┌─────────┐     ┌─────────┐     ┌─────────┐   │
│  │  Blob   │     │  Tree   │     │ Commit  │     │   Tag   │   │
│  │ (file)  │◄────│ (dir)   │◄────│         │◄────│         │   │
│  └─────────┘     └─────────┘     └─────────┘     └─────────┘   │
│                       │               │                         │
│                       ▼               ▼                         │
│                  ┌─────────┐    ┌──────────┐                   │
│                  │  Blob   │    │  Parent  │                   │
│                  │  Tree   │    │  Commit  │                   │
│                  └─────────┘    └──────────┘                   │
│                                                                  │
└─────────────────────────────────────────────────────────────────┘

Skill	Description
git-basics	Repository initialization and basic commands
staging-committing	Working with the staging area and commits
branching	Creating and managing branches
merging	Combining branches and handling merges

Skill	Description
gitflow	GitFlow branching model
github-flow	GitHub Flow simplified workflow
trunk-based	Trunk-based development
feature-branches	Feature branch workflow

Skill	Description
pull-requests	Creating and reviewing PRs
code-review	Code review best practices
merge-conflicts	Resolving merge conflicts
remote-repos	Working with remote repositories

Skill	Description
rebasing	Rebase operations and strategies
cherry-picking	Selective commit application
interactive-rebase	Interactive history editing
bisect	Binary search for bugs
reflog	Recovery with reflog

Skill	Description
commit-messages	Conventional commit format
branch-naming	Branch naming conventions
gitignore	File exclusion patterns
git-hooks	Automation with hooks

Skill	Description
git-aliases	Custom command shortcuts
git-config	Git configuration options

Quick Reference

Essential Commands

# Repository
git init                    # Initialize new repo
git clone <url>             # Clone remote repo

# Changes
git status                  # Check status
git add <file>              # Stage file
git commit -m "message"     # Commit staged changes

# Branches
git branch                  # List branches
git checkout -b <branch>    # Create and switch
git merge <branch>          # Merge branch

# Remote
git pull                    # Fetch and merge
git push                    # Push to remote
git fetch                   # Fetch without merge

Common Workflows

# Feature development
git checkout -b feature/new-feature
# ... make changes ...
git add .
git commit -m "feat: add new feature"
git push -u origin feature/new-feature
# Create PR, merge, delete branch

# Hotfix
git checkout main
git pull
git checkout -b hotfix/critical-bug
# ... fix bug ...
git commit -m "fix: resolve critical bug"
git push -u origin hotfix/critical-bug
# Create PR with priority review

File Structure

skills/git/
├── _index.md
├── fundamentals/
│   ├── git-basics.md
│   ├── staging-committing.md
│   ├── branching.md
│   └── merging.md
├── workflows/
│   ├── gitflow.md
│   ├── github-flow.md
│   ├── trunk-based.md
│   └── feature-branches.md
├── collaboration/
│   ├── pull-requests.md
│   ├── code-review.md
│   ├── merge-conflicts.md
│   └── remote-repos.md
├── advanced/
│   ├── rebasing.md
│   ├── cherry-picking.md
│   ├── interactive-rebase.md
│   ├── bisect.md
│   └── reflog.md
├── best-practices/
│   ├── commit-messages.md
│   ├── branch-naming.md
│   ├── gitignore.md
│   └── git-hooks.md
└── tools/
    ├── git-aliases.md
    └── git-config.md

Source

git clone https://github.com/Fujigo-Software/f5-framework-claude/blob/main/plugins/f5-core/skills/git/SKILL.mdView on GitHub

Overview

Git is the core system for tracking changes and coordinating work on code, enabling safe collaboration across teams. It covers basics to advanced techniques and workflow strategies to streamline development.

How This Skill Works

Git tracks changes using objects (blob, tree, commit, tag) and moves changes through a flow: Working Directory -> Staging Area -> Local Repository -> Remote Repository. Common commands like git add, git commit, and git push formalize this flow and enable collaboration.

When to Use It

When initializing a repository and starting to track files from day one
When collaborating with teammates via remotes, pushes, and pull requests
When developing features on isolated branches and integrating after review
When resolving conflicts during merges or rebases
When exploring history, auditing changes, or recovering lost work with reflog

Quick Start

Step 1: git init, git add ., git commit -m "Initial commit"
Step 2: git checkout -b feature/awesome; make changes; git commit
Step 3: git push -u origin feature/awesome; open PR and merge after review

Best Practices

Keep commits small and focused; each should capture a single change
Write meaningful commit messages that explain the intent
Use feature branches and pull requests to isolate work and enable reviews
Regularly fetch, pull, and push to stay in sync with remotes
Familiarize with Git object types (blob, tree, commit, tag) to reason about history

Example Use Cases

Initialize a repo and make the first commit
Create a feature branch, commit changes, and push to origin
Open a pull request and perform code review before merging
Merge a completed feature branch back into the main branch
Resolve a merge conflict and complete a rebase if needed