skills.rest
moughamir
moughamirCOMMUNITY
Explore all skills by this author →
Website𝕏@omnizyaGitHub

git-master

Guide Git repository operations with safety confirmations and recovery steps.

Updated Mar 26, 2026
Search Tags:#git#branching#rebase#conflict resolution#history rewriting#github workflow#reflog recovery
One-click install
npx skills add https://github.com/moughamir/justwaitit-review --skill git-master-moughamir
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-master
Source: https://github.com/moughamir/justwaitit-review/tree/main/.agents/skills/git-master
Command: npx skills add https://github.com/moughamir/justwaitit-review --skill git-master-moughamir

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git operations often become risky and confusing—especially for rebases, force pushes, conflicts, and history rewriting—so this Skill prevents mistakes by providing complete command guidance plus safety guardrails.

Core Features & Use Cases

  • Destructive-operation safety protocol: Explicit warnings, backup-branch recommendations, and confirmation flows for operations like hard resets, force pushes, and history rewriting.
  • End-to-end Git command mastery: Covers repository setup, branching workflows, merges, rebases (including interactive), cherry-picks, stashing, cleaning, worktrees, and submodules.
  • Recovery and troubleshooting: Uses reflog, fsck, bisect, and targeted recovery steps for lost commits, detached HEAD, conflicts, and corrupted states.
  • Platform and hosting workflows: Practical guidance for GitHub, Azure DevOps, Bitbucket, and GitLab operations (PR/MR flows and related tooling).

Quick Start

Ask the Skill: Would you like me to create commits automatically, stage changes only, or just provide guidance for the Git operation you need to perform on your repository right now?

Frequently Asked Questions about git-master

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

FAQPage Schema
How do I recover lost commits after a hard reset or bad rebase in Git?▼

Recover lost commits in Git by using the reflog to locate the dangling commit hash, then creating a recovery branch pointing to that hash to restore your repository state safely.

What is the safest way to rewrite Git history before a force push?▼

The safest way to rewrite Git history is to create a backup branch first, execute the interactive rebase, and use force-with-push to update the remote repository only after verifying changes.

Does this Git workflow guidance apply to Azure DevOps and Bitbucket?▼

Yes, this Git workflow guidance applies to Azure DevOps and Bitbucket, covering practical PR and MR flows alongside standard repository management, branching, and conflict resolution for hosted platforms.

How do I resolve merge conflicts during an interactive rebase?▼

Resolve merge conflicts during an interactive rebase by manually editing the conflicted files, staging the corrections, and continuing the rebase sequence while the system safeguards your commit-creation preferences.

Why do I need a backup branch before doing a hard reset?▼

You need a backup branch before a hard reset because it captures your current commit history, allowing you to recover lost work via reflog if the destructive operation removes uncommitted changes or needed commits.

Related Skills

Explore More Software Engineering Skills→
Geralt1983Geralt1983
1

git-sync

Commit and push local workspace changes to a remote GitHub repository.

Community
Basic
eavichayeavichay

git-publish

Synchronize local git branches with remote repositories and create pull or merge requests.

Community
Intermediate
zizzfizzixzizzfizzix

code-review

Automate code review for architectural, security, and quality compliance.

Community
Advanced
wewetv1987-cellwewetv1987-cell

git-essentials

Guide Git repository setup, branching, merging, and remote synchronization.

Community
Intermediate