การรีเบสแบบโต้ตอบและการแก้ไขคอมมิต

Git history gets messy — a forgotten file, a typo'd message, ten tiny commits that should be one. Git lets you rewrite history to clean it up.

git commit --amend fixes your most recent commit: change the message, add forgotten files, or tweak content. It replaces the last commit with a tidier one.

Forgot a file right after committing? Stage it, then git commit --amend folds it into the last commit. Here's the flow.

Need to fix commits further back, not just the last one? Interactive rebase (git rebase -i) is a full editor for a series of commits.

Start an interactive rebase by naming a commit before your target range. To edit the last three commits, use HEAD~3.

The rebase editor lists commits with commands you can swap: pick keeps it, reword edits the message, squash/fixup merge it up, edit pauses to amend.

To change an older commit's message, switch its line from pick to reword in the editor. Git then prompts you for the new message.

Got several small commits that belong together? squash merges them into one meaningful commit — change the lines below pick to squash.

The edit command pauses the rebase at a specific commit. Make changes, git add, git commit --amend, then git rebase --continue.

Rewriting changes commit IDs — safe for local-only commits. Never rewrite history that's already pushed and shared; it wrecks your collaborators' work.

You've made a commit with the message "Fix bug". You then realize you forgot to include one small file in that commit. What is the most appropriate Git command to fix this, assuming you haven't pushed the commit yet?

Recap: git commit --amend fixes the last commit, while git rebase -i rewrites a series — reword, squash, fixup, or edit. Just be careful on shared branches.