Manage Git history with rebases, stashes, resets, and reflog recovery.
npx skills add https://github.com/dotBeeps/hoard --skill git-dotbeeps
Please help me install this Agent Skill. Skill: git Source: https://github.com/dotBeeps/hoard/tree/main/morsels/skills/git Command: npx skills add https://github.com/dotBeeps/hoard --skill git-dotbeeps
Provides an opinionated, practical workflow to avoid messy commit history, reduce painful merge conflicts, and recover lost work in solo and small-team git projects. It captures conventions for branching, local cleanup, integration, and emergency recovery so developers can move faster with less risk.
Use the git skill to get step-by-step guidance for rebasing a feature branch onto main, resolving conflicts, and preparing a clean squash-merge for the pull request.
High-intent search queries and answers about installing and using this skill.
Resolve git merge conflicts by using interactive rebase with autosquash to tidy commits, applying conflict resolution strategies like rerere and merge strategy flags to safely integrate feature branches onto main.
Recover lost commits by navigating the git reflog to find the orphaned commit hash, then executing a hard reset to that reference to restore your branch state and salvage feature work.
Clean up a messy feature branch by creating fixup commits, running an interactive rebase with autosquash to consolidate the history, then squash-merging to main for a single reviewable commit.
Use git bisect to hunt regressions by marking known good and bad commits, allowing the system to binary search the history and automatically check out intermediate revisions to isolate the bug.
Avoid rebasing shared branches because rewriting public history causes divergent trees and painful conflicts; instead, preserve merge commits or use short-lived GitHub Flow branches to simplify rollbacks.
Stash uncommitted changes to save your working directory state, switch branches to handle emergencies, then restore the stash using stash workflows to resume your feature development seamlessly.
FutureAtomsCreate and manage Git branches with standardized naming conventions.
pkuppensSynchronize local Git branches and delete merged or obsolete ones.
hung-phanImplement a trunk-based development workflow with short-lived branches and feature flags.
latestaiagentsGuides Git rebase operations with conflict resolution and recovery via reflog.
