I have a previous commit.
After that commit I edited a file. But after that I messed up one thing.
I want to return to a previous commit but save changes in that one file. The file hasn't been committed.
How can I achieve this?
P.S.: I know that I can simply copy the contents of that file that I edited and after the returning to an older commit just paste it in there, but I want to learn how to do it using Git since there could be more complicated scenarios.
git reset --soft HEAD~1
From the git docs:
git reset [<mode>] [<commit>] This form resets the current branch head to and possibly updates the index (resetting it to the tree of ) and the working tree depending on . Before the operation, ORIG_HEAD is set to the tip of the current branch. If is omitted, defaults to --mixed. The must be one of the following:
--soft Does not touch the index file or the working tree at all (but resets the head to , just like all modes do). This leaves all your changed files "Changes to be committed", as git status would put it.
git commit --fixupand interactive rebase? In other words: do you want to apply the changes to the older commit?git log --graphcurrently and the desired output, we can answer exactly. Also it's not clear if your latest edit has been committed yet.stashor commit on a temporary branch