Git中如何执行Squash提交？Eclipse环境下的操作指南

Got it, let's break this down into two practical parts—first the command-line approach to squash commits in Git, then how to do it visually in Eclipse with EGit.

The most common way to squash commits is via interactive rebase, which lets you clean up a sequence of recent commits. Here's how:

• First, decide how many commits you want to merge. For example, to squash the last 3 commits into one, run:

  git rebase -i HEAD~3
  

  If you want to squash all commits after a specific commit (say, with hash abc123), use:

  git rebase -i abc123
  

• This will open a text editor (like nano or vim) listing your target commits, each starting with pick. Change pick to squash (or its shorthand s) for every commit you want to merge into the one above it. For example:

  pick f7f3f6d Add user authentication feature
  squash 310154e Fix login form validation bug
  squash a5f4a0d Update auth docs with setup steps
  

  The first pick will be the base of your final commit, and the others will get folded into it.
• Save and exit the editor. A second editor window will pop up, letting you edit the final commit message. You can combine the messages from the squashed commits or write a new, concise one—then save and exit.
• That's it! Your commits are now squashed into a single, clean commit.

⚠️ Heads up: If these commits are already pushed to a remote repo, you'll need to force-push the updated history. Use the safer --force-with-lease option to avoid overwriting teammates' work:

git push --force-with-lease

Always coordinate with your team before doing this, as it rewrites public commit history.

Alternatively, if you want to squash an entire feature branch when merging into main, you can use:

git merge --squash feature-branch
git commit -m "Merge feature-branch: Add user authentication (squashed)"

This creates a new commit with all the branch's changes, without altering the original branch history.

Eclipse's EGit plugin makes squashing commits straightforward with a graphical interface:

• First, open the Git Repositories view if it's not already visible: Go to Window > Show View > Other..., then select Git > Git Repositories.
• In the view, find your project repo and checkout the branch you want to clean up (right-click the branch > Checkout).
• Right-click the repo and select Team > Rebase....
• In the "Rebase" dialog, set your rebase base:
  • To squash the last n commits, choose HEAD~n from the "Source" dropdown (e.g., HEAD~3 for 3 commits).
  • Or enter the hash of the commit you want to squash after.
• Click Next to open the interactive rebase screen. Here, you'll see a list of commits with an "Action" column set to Pick by default.
• For every commit you want to squash, click the "Action" dropdown and select Squash (this keeps the commit's message to merge into the final one; use Fixup if you just want to keep the code changes and discard the message).
• Once you've set all actions, click Finish.
• A "Commit Message" window will appear. Edit the message to be clear and concise, then click OK.
• Your commits are now squashed. If you need to push to remote, right-click your branch > Push.... If you've already pushed the original commits, check the "Force update" option (again, make sure your team is aware before doing this).

内容的提问来源于stack exchange，提问作者user9469186