Let <labname> be the name of the lab you are currently working on.

No new commits

reset some changes

If you have not made any new commits since pulling the lab, and you want to reset any changes to a single file, do the following under the <labname> directory:

git checkout <file-you-want-to-reset>

reset the entire lab

If you have not made any new commits and you want to reset the entire lab, do the following under the gpi-labs directory:

rm -r <labname>
git checkout <labname>

Made a new commit

no new changes since the new commit

If you have made a single new commit since pulling the lab, and you have not made any new changes since the new commit, and you want to reset all changes in this new commit, do the following under the <labname> directory:

git reset --hard HEAD^

made changes since new commit

You will need to remove/reset those changes first (see no new commit’s), before the following the instructions for (no new changes since new commit).

Copyright © 2014, Great Practical Ideas in Computer Science.