Practical Git: Capture code history snapshots with git add/commit/push

Trevor Miller
InstructorTrevor Miller

Share this video with your friends

Send Tweet
Published 6 years ago
Updated 3 years ago

When working with Git, the most common thing developers do is stage, commit, and push the changes they make to a code base - this "edit -> stage -> commit -> push" cycle is the main workflow when using Git; it lets developers make "snapshots" of changes to their codebase which they can share and revert back to. In this lesson, we make some changes to our codebase and then git add (stage), git commit (store in history), and git push (sync with our remote repository) those changes. We also use git status along the way to see an update of where our repository is at.

[00:00] In our command line, we're in a directory called utilityfunctions, and if we take a look at the contents of this folder, we can see that we have a couple of files as well as .gitdrectory, so we know that this is a git repo. We'd like to make a few changes to the code in this directory, so the first thing we're going to do is run git-status, and this will tell us the status of our repo. Right now it says our working directory is clean.

[00:26] If we take a look at the contents of our files again, we were told that this getrandomelement.js file isn't working as we expect, so we need to go in and fix it. I've opened the file in my editor, and it looks like we're missing a bracket at the end of this statement, and it should be a closing bracket to match this one. So let's fix that. Back on our command line if we run git-status we can see that it's changed. It says here that our changes are not staged for commit, and that we've modified this file, which is what we expect.

[00:59] Now let's type git-add -A and what this will do is it's saying that we want to add or stage all of the changing that we see here in our status. So if we run this command and the run git-status again, it says that our changes are ready to be committed. This means that the changes that we see here have been added to the staging area, which is a place where we can add and remove from until we are ready to commit.

[01:30] Now to commit what we have in our staging area, we'll type git-commit -m which stands for message, and we'll give it a commit message. This message will be helpful for us and our team members in the future to know why something was changed. We're going to say that we had to add a missing bracket, and now if we run that and the run git-status again, it says that our local repo is ahead of our remote repo by one commit.

[02:00] So now to sync up all of these changes with our remote repo we need to push the commits we've made, so I will say git-push and if we run that, and then run git-status again, we're back to where we started, where it says that the working directory is clean again. If we take a look at our remote repository now, we can see that our commit here, add a missing bracket, was added.

[02:22] If we look at the file, the bracket is now in the repo on the remote repository. Now we thought of another utility function that would be helpful to have in our repo, so let's create that. In my code editor I've created a new file called getrandomnumber inside of our directory, and now I'm going to add some code to this file. Now that I've written this code I'm going to save and close the file, and go back to my command line. While we're at it, let's delete ReadMe, because we know we need to rewrite it, and this isn't a very good one.

[02:52] Let's check our status again, and we can see that there has been a deleted file as well as a new file. It says here that it is untracked. Now that we've made changes to our working directory we need to go through that same process of staging and then committing our changes. So we'll say git-add -A and then git-commit with the commit message. In this commit we removed the old ReadMe, and added a new function.

[03:20] So now if we run git-status again, it says that our local repo is ahead of our remote repo by one commit. So we do git-push and now it looks like our working directory is clean again. Looking at my remote repository I can see that the new getrandomnumber file was added as well as our commit message, and our ReadMe file has been removed.

~ 5 years ago

trying to follow along with your example, should the files match up? Your repo is example-utility-functions instead of just utility-functions

Trevor Miller
Trevor Millerinstructor
~ 5 years ago

The git commands are meant to be general to be applied to any git repo :) Thanks for watching.