Git - How to edit old (not previous) commit with some of the unstaged changes from current index (current state)?

Question

I\'ve taken a look at these previous questions already:

• Howto add a changed file to an older (not last) commit in Git
• How do I edit a previous git comm

Answer 1

`git stash`
`git checkout `
`git stash pop`
`git add` (selectively--one file at a time)
`git commit --amend`
`git stash` (to re-stash all the changes you didn't commit)
`git branch temp`
`git checkout master`
`git rebase temp -i`

This will open a text editor with a list of commits--one commit per row. Delete the first row, which is the old commit that you want to replace. Save and close.

`git branch -d temp` (to clean up the branch you created)