The commit history looks like this: Commit1 CommitFIX Commit2 Commit3

How to remove CommitFIX history so that its edits are in Commit1?

  • one
    git rebase . Just enter CommitFIX commit (commit B in terms of response by reference) to Commit1 (A) - AK ♦
  • @AK If you rebase old commits locally, will they go via git push to remote? - jin90 5:03 pm
  • ru.stackoverflow.com/a/751168/178576 - aleksandr barakin
  • one
    @ jin90 if by "old" it is meant "pushed" then only through push --force with all the ensuing consequences. - AK ♦

1 answer 1

To solve this kind of problem, use the interactive version of the git rebase .

  1. Switch to Commit3

     git checkout Commit3

  2. Run interactive git rebase

     git rebase -i HEAD~4

  3. The environment for editing the history change script will start. Use squash to merge commits.

     pick Commit1 squash CommitFIX pick Commit2 pick Commit3 # Rebase 710f0f8..a5f4a0d onto 710f0f8 # # Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command (the rest of the line) using shell # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # # However, if you remove everything, the rebase will be aborted. # # Note that empty commits are commented out

  4. Save the file and exit it to run the script.

  5. Check history, it will be successfully changed.

PS Be careful when using this technique, because git rebase essentially creates new commits. Do not change the history if you have already sent changes to the remote repository.