【Git】なぜ作業ブランチが必要か｜working branch

What Does “Messy History” Actually Refer To?

履歴が汚れるとは？

• “Too many small WIP commits”
  → Things like WIP: fix, tmp, debug log piling up in the log
• “Noise unrelated to meaningful progress”
  → Intermediate “just testing” commits that add no long-term value

In short: it’s when your history is full of clutter that tells future readers nothing useful.

When It Is a Problem

• In team projects
  → Reviewers or git blame readers struggle to see intent
  → Hard to tell which commits are meaningful vs. experiments
• In long-lived repositories
  → Future maintainers (including you!) will have a hard time tracing the logic

When It’s Not a Problem

• Short-term personal experiments
  → You can always clean up later
• Local-only work
  → No one else will be affected, so clutter doesn’t matter

How to Work Safely Without Worrying About “Messy”

汚れを気にせず安全にやる方法

Go all-in with WIP commits → then consolidate later

一旦WIPでガンガン刻む → 最後にまとめる

git reset --soft <start-tag>
git commit -m "refactor: split session controller"

Merge small WIPs into one meaningful commit.

履歴を1つの意味あるコミットに整える

Use interactive rebase to tidy history

git rebase -iで整理

git rebase -i HEAD~10

Use pick, squash, or fixup to group and clean commits.

pick / squash / fixup で意味のある粒度に揃える

Use git commit --amend to rewrite recent WIPs

git commit --amendで上書き

git commit --amend

As long as you haven’t pushed yet, you can polish the last commit.

まだpushしてない段階なら、直近のWIPをキレイに書き直せる