What should I do to get source code from the last pushed commit?

Question

I thought I know simple features of git until I began work with other contributors:)

The situation is as follows:

1. I pulled source code from repository (from commit: 2c49868).
2. I changed some of the code and I noticed that the changed app doesn't worked. I didn't use git commit and I didn't use git push.
3. I would like to restore the source code before the change (from commit: 2c49868).

What should I do to not spoil the repo?

I'm going to do:

git fetch --all
git reset --hard origin/master

Is it correct or maybe is better way to do this?

---

EDIT:

It turns out that:

1. I pushed the source code with new commit: (c6a7e5f) on the service computer at work yesterday.
2. I change some of the code locally (I didn't use git commit and I didn't use git push.
3. I went home.
4. I pulled the source code (from commit: c6a7e5f) on the another, personal computer.
5. I changed the source code and added/deleted some of files at home, used git commit (commit: 2c49868) and git push.
6. Today, I came back to work (to service computer). In my IDE I see the changes from the second point and I would like to have the source code from the fifth point (commit: 2c49868).

In conclusion: I don't want to have local changes (from the second point) on the service computer because they are still here, but I want to have the newest source code from this repo on the service computer.

I am asking for your understanding.

Answer 1

I think you should revert the changes. Then you will come to the last commit. I think you do it correctly, but fetch is unnecessary.

In case you want to include folders have look into this post, or this one.

I would also copy my changes into local text editor before doing reverting. In case you are using Intellij IDEA I advise to shelve your changes. That means that your local changes will be saved and you will come to the last pushed commit. Shelving and unshelving are well described in Jetbrains documentation.

Answer 2

if you did not commit it there are a few things you can do

git stash 

This will stash your changes and bring you back to the correct source - you may want them later.

or git reset --hard

This will wipe out differences in the working tree (you can not get your changes back)

If you want to clear any untracked files git reset will not be enough and you have to use

git clean -f

This will remove any files from the tracked root directory that are not under Git tracking.

There is no need to do a fetch beforehand if you are up to date.

If you did commit it (i am assuming you did it in 1 commit) you can do

git reset --hard HEAD^

This will reset the last commit and remove it completely (use hard with caution and if you are worried use soft and then revert once you checked what it has rechecked out.)