Discarding Temporary Changes

Discarding channges

1) If you make some changes to the file workshop.txt, but then decide that they weren’t correct or were unnecessary, you can easily get back to the head of the branch with the following command:

git reset HEAD workshop.txt

This permanently discards these changes!

git reset --hard HEAD

2) Alternatively, if you want to hide the changes now, but might come back to them, you can use:

git stash

This creates a list of changes which are stored, but not committed, and which you can recover later. You can stash multiple times. Change your file and then stash it, and then repeat that again a few times.

3) To look at a list of the stashes you’ve made, just type:

git stash list

4) To recover the most recent set of changes, you can just type

git stash apply

If you want a different set, you can type:

git stash apply stash@{2}

If there is a clash between your current commit and the stashed code, you will get a merge conflict which you’ll need to resolve.

5) If you recover something from a stash, but then decide you don’t want it anymore, you can achieve this by ‘unapplying’ the stash, using the following command:

git stash show -p stash@{2}| git apply -R

If you don’t specify which stash from the list you recovered from, git will just assume you chose the most recent one.