rebase-safely
starsforks
How to install rebase-safely?
archive228/loopkit/rebase-safely
$npx -y skills add Archive228/loopkit --skill rebase-safelyRebase, squash, or rewrite history without losing work or breaking shared branches. Use before any history rewrite.
SKILL.md
| 1 | # Rebase Safely |
| 2 | 1. **Backup first** — `git branch backup/<name>` before any rewrite. Free undo. |
| 3 | 2. Rebase onto the latest base: `git fetch; git rebase origin/main`. |
| 4 | 3. Resolve conflicts one commit at a time. Test after the rebase, not just that it "completed". |
| 5 | 4. **Never rewrite shared history** — if others pulled the branch, rebasing it forces them into pain. Rewrite only your own un-pushed/un-shared commits. |
| 6 | 5. Push with `--force-with-lease`, never bare `--force` (lease refuses if someone else pushed). |
| 7 | If anything goes sideways: `git reflog` finds the pre-rebase state; `git reset --hard backup/<name>` restores it. |
People who liked this also viewed
6 picksType
- caveman-commitUltra-compressed commit message generator. Cuts noise from commit messages while preserving intent and reasoning. Conventional Commits format. Subject ≤50 chars, body only when "why" isn't obvious. UsSkillsJul 2026
- git-guardrails-claude-codeSkills for Real Engineers. Straight from my .agents directory.SkillsJul 2026
- setup-pre-commitSkills for Real Engineers. Straight from my .agents directory.SkillsJul 2026
- resolving-merge-conflictsSkills for Real Engineers. Straight from my .agents directory.SkillsJul 2026
- using-git-worktreesUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallbackSkillsJul 2026
- finishing-a-development-branchUse when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanupSkillsJul 2026
