git-operations

Guide safe Git workflows for branching, committing, merging, and rebasing.

Updated Jan 30, 2026

Search Tags:#git #workflow #branching #merging #version-control #rebasing

Ready to run

npx skills add https://github.com/cloudwithax/crusty --skill git-operations-cloudwithax

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-operations
Source: https://github.com/cloudwithax/crusty/tree/main/cogs/skills/git-operations
Command: npx skills add https://github.com/cloudwithax/crusty --skill git-operations-cloudwithax

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill guides users through safe, repeatable Git workflows to manage code changes and history, reducing destructive mistakes.

Core Features & Use Cases

Structured workflows for branching, committing, merging, rebasing, undo/recovery, and conflict resolution.
Remote syncing and history management to keep local work aligned with team repositories.
Safety-focused guidance that emphasizes inspecting changes before commits and avoiding dangerous commands.

Quick Start

Start by checking the repository status with git status, review changes with git diff, stage files with git add <files>, commit with a descriptive message using git commit -m "message", and verify history with git log --oneline -5. When collaborating, pull with rebase and push to your feature branch.

Frequently Asked Questions about git-operations

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I resolve git merge conflicts safely?▼

Resolve git merge conflicts safely by reviewing changes with git diff, staging resolved files with git add, and committing with a descriptive message using git commit. This structured workflow prevents destructive mistakes and keeps history clean.

What is the best way to undo a git commit without losing changes?▼

The best way to undo a git commit safely is following structured recovery workflows that avoid dangerous commands. Inspect history with git log, review changes with git diff, and use safe undo operations to preserve your work.

How do I rebase a feature branch to sync with remote changes?▼

Rebase a feature branch by pulling with rebase to sync local work with team repositories. Check status with git status first, then verify history with git log --oneline -5 after rebasing to ensure clean alignment.

When should I use git stash instead of committing changes?▼

Use git stash instead of committing when you need to temporarily save uncommitted changes without altering repository history. Always review changes with git diff before stashing and check status with git status to confirm.

Do I need to review changes with git diff before every commit?▼

Yes, reviewing changes with git diff before every commit is a safety-focused best practice. Inspecting staged and unstaged changes prevents accidental commits of debug code or unwanted files into your version control history.