I made 3 'git commit' but I have not done a 'git push'.
1. commit 1
2. commit 2
touches fileA
touches fileB
touches fileC
3. commit 3
So How can I
This should work:
1. git rebase -i HEAD~2
2. in your editor, select the following:
edit 9b86592 commit 2
pick f3907cb commit 3
3. at this point roll back the changes you made in fileB, for example with
`git checkout <version_you_want>` or by manually editing the file
4. make the changes in fileC you want to be part of commit 2
5. `git add fileB fileC`
6. `git commit --amend`
7. `git rebase --continue`
You may need to resolve merging issues if there are conflicts when git tries to apply commit 3. After you resolve those, run git rebase --continue again.
Use git rebase -i HEAD~2 and edit the second commit.
Assuming that you are on branch master and have a clean tree:
# checkout incorrect commit
git checkout <sha1_of_commit2>
# revert the changes to fileB by checking out the parent version
git checkout HEAD^ -- fileB
# make an amended commit
git commit --amend
# go back to master
git checkout master
# transplant the changes since the bad commit onto the amended commit
git rebase --onto HEAD@{1} <sha1_of_commit2>
rebase -i command and how to edit the interactive rebase commit list in addition to the other important steps. Describing how to do things 'manually' is simpler. Most of the answers suggesting rebase -i either have more steps than my recipe, or more complex steps or more implied steps that aren't explicitly described.This is how I would do it.
Checkout the old version of fileB and commit it
git checkout HEAD~3 -- fileB
git commit -m"fix fileB" fileB
Now rebase to squash in your fix with the old commit
git rebase -i HEAD~3
now move your most recent commit "fix fileB" to be after commit 2, and change the "pick" instruction to "squash", joining the commit changing fileB with the commit resetting it.
