How can I easily fixup a past commit?

Question

I just read amending a single file in a past commit in git but unfortunately the accepted solution \'reorders\' the commits, which is not what I want. So here\'s my question

Answer 1

I'm not aware of an automated way, but here's a solution that might by easier to human-botize:

git stash
# write the patch
git add -p 
git commit -m"whatever"   # message doesn't matter, will be replaced via 'fixup'
git rebase -i ~1
# now cut&paste the "whatever" line from the bottom to the second line
# (i.e. below ) and change its 'pick' into 'fixup'
# -> the fix commit will be merged into the  without changing the
# commit message
git stash pop