Getting started with GIT – Part 4

By -

Welcome Back!!! to the part 4 of git tutorial series. This part is going to be a short one. In previous parts we used some text files as our project. In this tutorial we are trying work with a small project. For the project I am going to use a basic HTML website I made.


  • So, first thing we need to do is turning our normal folder which contains project files into git project.
  • So, I am going to open up the git bash and navigate to the project folder using “cd” command.


  • Initiate the git repository using the command “git init”.
  • Now try “git status” command. You will notice that we have our files listed under untracked files.


  • So, we should add those files using “git add” command.


  • Period is used to add all the files.
  • Then we should commit.

  • Now, all set for learning new stuff.

Let’s learn how to undo changes done to our working directory.

  • First let’s look at the current status of our website.


  • Let’s say I accidentally changed position property of <h3> element to fixed. (you can change whatever you want).


  • So, I now messed up my code. So, I need to undo whatever the changes I made to the file.
  • So, I need to take the files from the repository and replace them with my messed-up files.
  • First thing we are going to do is entering the command “git status” to check current status.


  • You can see git says that we modified the style.css file. Now we need to take files from the repository and replace them with my working copy. To achieve it we use “git checkout -- <file name>” command.


  • If you enter “git status” command, you will notice that says that our working copy and the repository are same now.

  • If we refresh our website, you can see the it is also came back to the previous stage.


Let’s learn how to unstage files.

  • Let’s assume I decided to change the background color of my website to light blue.




  • After changing the color, I am going to add the changes to the staging area.


  • Now I enter the git status command to check whether modified files are added to the staging area.


  • After all these scenarios now, I feel like that the background color that was there earlier is better.
  • Now I want to remove the file from the staging area and bring it back to my working copy. Simply I want to unstage the file. We can do so by using “git reset HEAD <file name>” command.


  • Now if I check the status you can see that the file is unstaged.



  • Okay, it is the end of part 3. Lets meet with the next part of the tutorial. :)






Comments

Post a Comment

Popular Posts

Getting started with GIT – Part 3

By -
This is the part 3 of tutorial getting started with git. Now let’s see how to delete files. We can use “ git rm <files name> ” command to delete files. Let’s commit the changes we made. Note: Here, you may notice that we did not add our changes to staging area. That is because when we use “git rm” command, it already adds the deleted file to the staging are. Let’s learn how to rename and move files. First, we are going to rename a file as we normally do. I am going to rename the “first.txt” file into “index.txt”. Let’s see what git thinks about the renaming we did. You can see git thinks that we deleted the first.txt file and added another file called index. So, we can act according to git. Now we are going to add the index.txt file and remove the first.txt file. If we check the status now using “ git status ”, you will notice that git has realized what we actually did was renaming the file. As always commi...
Read more

Getting started with GIT – Part 2

By -
Welcome to the part 2 of tutorial getting started with git. In the part one we had a one text file in our project. So, let’s create some new files. Now enter the status command. You can see it says that you have untracked files. Here, untracked means we did not commit them, and git does not keep track on changes done to those files. So, in order git to keep track of our files we need to commit them. Earlier in the part 1, we add all the files using “ git add . ” command. Now we are going to add files one by one. Now let’s enter the status command. We still did not commit the "second.txt" file. So, you can see it is there in the changes to be committed area. That is the staging area. Staging area is a place between your working copy and the core repository. Whenever we execute the add command on a file, that file goes to the staging area. The staging area includes the files that are ready to get committed. Whenever y...
Read more

Getting started with GIT – Part 5

By -
This is the 5th part of the getting started with GIT tutorial series. Here we will explorer some most important functions of GIT. This is a continuation from the last part "Getting started with GIT – Part 4 ". Lets see how to get old version of our project. First I am going to view all my commits using “ git log ” command. Currently my website looks like this. Now I am going add another main content area to my website. And commit those changes to the repository. And again, I am going to add another(fourth) main content are to my website and commit those changes. Now let’s check our git log. Now website looks like this. So, we assume we only need 3 main content blocks and we want to go back to the commit where we had only 3 main content blocks. We can achieve it by checkout the version with only 3 content areas. So, we can use command “ git checkout <commit number> -- <the file name> ”. So,...
Read more