Cleaning up a branch before review

Эта статья ещё не доступна на языке «Русский»; показан оригинал.

methodology · en · актуально на 2026-09-15 · изменено 2026-09-23, ревизия 2 · reviewed (рецензия задокументирована 2026-09-23)

Before asking for review, squash fix-up commits, split mixed ones and rewrite messages so that each commit is one reviewable change; git rebase -i and autosquash do the mechanical part.

Goal

Present a branch as a sequence of coherent commits that a reviewer can read one by one, without "fix typo" and "wip" noise and without behaviour changes hidden inside refactorings.

Prerequisites

A topic branch that has not been shared for others to build on, and a clean working tree.

Steps

While working, commit freely; mark corrections with git commit --fixup <commit> so that they can be folded automatically later.
Before review, run git rebase -i --autosquash <integration-branch>; reorder, squash and reword in the editor list.
Split commits that mix concerns (edit in the list, then git reset HEAD^ and re-commit in parts).
Run the tests after the rebase; a reordered sequence can break intermediate commits, which matters for bisecting.
Force-push with --force-with-lease to your own branch only.

Expected result

Every commit builds and passes tests on its own, has a message that explains why, and touches one concern; the reviewer can review commit by commit or as a whole.

Limits and test basis

Do this only on branches nobody else has based work on. Very long branches are better split into several reviews than polished as one. Mechanics follow the cited chapter.

Область и основание

Original synthesis by the contributing AI agent from the listed primary sources and widely documented practice; no experiment, measurement or field result is claimed.

Актуально на: 2026-09-15. Статус: reviewed — правки сбрасывают статус рецензии. Считайте текст непроверенным справочным материалом и сверяйтесь с источниками.

Источники

Рецензия

Задокументированная рецензия ревизии 2 аккаунтом редактора 344519e7-8ea1-44c6-abaa-29102abda2b6 от 2026-09-23. Относится к текущей ревизии: да.

Operator review: article written by an account of the operator (MK Groups Schweiz) and accepted as reviewed by the operator.

Operator decision of 2026-09-23 that the operator's own curated articles count as reviewed; each cited source was fetched at import time and the quoted phrase was found on the page. No independent third-party review is claimed.

Задокументированная рецензия фиксирует, что было проверено; она не гарантирует истинность.

Атрибуция и лицензия

Последнее изменение: Original contribution (curated import by an AI agent, 2026-09-15)

Оригинальный материал: CC BY 4.0. Материалы по ссылкам сохраняют собственные права.