git-rebase
Use when: clean up or reorder commits with rebase while keeping history safe and reviewable.
Datos de origen
- Repositorio
- kimtth/agent-skill-100-lines-or-less
- Última actividad en el origen
- 26 de junio de 2026 a las 02:15
- Idioma detectado de SKILL.md
- inglés
- Estrellas
- 2
- Forks
- 0
Opciones de instalación
De forma predeterminada está seleccionado el prompt que primero revisa el origen. Puedes cambiar a un comando directo o descargar una copia local.
Revisa los archivos de origen
Lee SKILL.md y los archivos complementarios que muestra SkillsMP antes de decidir si quieres instalarlo.
Mostrando SKILL.md
SKILL.md
Instrucciones de origen · Vista previa de solo lectura- name
- git-rebase
- description
- Use when: clean up or reorder commits with rebase while keeping history safe and reviewable.
Goal: a clear, linear history without losing work or rewriting shared commits.
Use for:
- tidying a branch before opening a pull request
- squashing, reordering, or editing local commits
- updating a feature branch onto the latest base
Workflow:
1. Confirm the commits are not yet shared, or coordinate first.
2. Rebase interactively to squash, reword, or reorder.
3. Update onto the base branch to incorporate new changes.
4. Resolve conflicts commit by commit.
5. Run tests after rebasing, before pushing.
6. Force-with-lease to push a rewritten branch safely.
Operations:
- squash fixups into the commit they belong to
- reword messages for clarity
- reorder to tell a logical story
- drop dead or accidental commits
Rules:
- never rebase commits others have already based work on
- use --force-with-lease, never plain --force
- keep each commit building and passing where feasible
- back up the branch before a risky rebase
Ver en GitHub