How to remove selected commit log entries from a Git repository while keeping their changes?

git-rebase(1) does exactly that.

$ git rebase -i HEAD~5

git awsome-ness [git rebase –interactive] contains an example.

1. Don’t use git-rebase on public (remote) commits.
2. Make sure your working directory is clean (commit or stash your current changes).
3. Run the above command. It launches your $EDITOR.
4. Replace pick before C and D by squash. It will meld C and D into B. If you want to delete a commit then just delete its line.

If you are lost, type:

$ git rebase --abort