Easy-to-follow video tutorials help you learn software, creative, and business skills.Become a member

Adding files

From: Git Essential Training

Video: Adding files

In this movie we're going to talk about how to add files to you Git repository. Now we already did that once we did that when we did our initial commit, but now we have a better understanding of the Git architecture and how that works. So I want us to revisit again, and we'll get some more insights. If you remember that we have our Git project here, and I have first_file.txt, which I've already committed during my initial commit. In the command line I'm in that same project directory and the first Git command that I want us to learn is git status. Git status is going to report back to us the difference between our working directory, the staging index, and the repository. It's going to let us know, what is the status between those three different trees? Right now, it says we're on branch master we talked about that the default branch is called master. We're going to be working on master all the way up until we start talking about creating new branches, so you can pretty much just ignore that, we're on the master branch.

Adding files

In this movie we're going to talk about how to add files to you Git repository. Now we already did that once we did that when we did our initial commit, but now we have a better understanding of the Git architecture and how that works. So I want us to revisit again, and we'll get some more insights. If you remember that we have our Git project here, and I have first_file.txt, which I've already committed during my initial commit. In the command line I'm in that same project directory and the first Git command that I want us to learn is git status. Git status is going to report back to us the difference between our working directory, the staging index, and the repository. It's going to let us know, what is the status between those three different trees? Right now, it says we're on branch master we talked about that the default branch is called master. We're going to be working on master all the way up until we start talking about creating new branches, so you can pretty much just ignore that, we're on the master branch.

And it tell us there is nothing to commit our working directory is clean, that's letting us know that there's nothing in the staging directory and the working directory exactly matches what is in the repository and the current branch where the HEAD pointer points to that exactly the same things that we have in our working directory. Now let's add some files. So in order to put some new files inside this project I'm just going to open up my text editor, I'll create a new file we'll call, This is a second file, and I'll save that as second_file.txt, and I'll just save it to my desktop and then let's go ahead and make another one here, this is a third file, and we'll do Save As third_file.txt.

So now I've got two file second file and third file, and I'm just going to drag both of those into my project. So now I've added two new files to the project, let's do git status again and see what Git tells us about it. Now Git tells us that there is a section called untracked file. Essentially what Git saying is, I have information about what's in the repository, and I can see your working directory. Your working directory has some new things, they're things that I'm not currently tracking. That is, if you make text edits to these, I'm not going to be able to tell you information about what changed because I'm not currently tracking these.

And then it helpfully tells us that if we want to add them we use git add followed by the file name to include what will be committed. Now if we want to include one file we just say git add and the first file name. If we want to include multiple files we can say git add one file name after another, or as we saw before, we could just do git add with a dot to add everything that's in this directory. Now we are not going to do that this time, we're going to go ahead and list it out. If I start typing the name of the file then hit Tab it'll auto-complete it for me, git add second_file.txt, I'm going to tell it to add it to my staging directory.

Remember how we did that with the illustration, we move it from the working directory into the staging directory with git add. Now when I do git status, let me clear the screen just so it's clearer between the two. Now it tells me two different sections, it say changes to be committed, that is my staging index that's things that are being staged and ready to be committed. You can see that here because it also tells us helpfully what the command is to unstage things, to take them out of the staging index. And then we still have our untracked files down here, these have not been added yet, these are just in our working directory.

One file is now in my staging index, one file is still in my working directory. Now let's do a commit. So we're going to commit, remember the command for commit it just git commit, and then we want to provide a message, so -m and then in quotes we'll put our message, Add second file to project. So that's going to be the message that goes with my commit. Now, what is it going to commit here? It's going to commit what's in my staging index, I've staged things to be committed so that's what gets committed.

So now it makes my commit, gives me the commit message, gives me the first part of the SHA back so I can see that. And then it tell me some information about what changed, about sort of the amount of things that were changed. We don't have to worry too much about that. Now let's do git status and see what it tells us, git status, I'll clear it just so that's easy to see the difference. Now it no longer reports anything about second file, because second file has been added to our repository, it doesn't tell us anything about it if what we have in our working directory is exactly the same, it's just reporting the differences to us.

And the difference here is that there's a third file and third file is not tracked still, it didn't get added in my commit it got left in my working directory, only the thing that I staged got put into the commit. If we do a git log, I'll clear the screen again just so it's nice and clear, you'll see that here's my second commit with my second message right after my initial commit. So they're always going to be in reverse chronological order the oldest ones will fall further down the list the most recent things will be at the top.

Now of course, if we want to git status again if you want to add third file to our repository git add third_file.txt. Now that's going to be in our staging index, see it there, changes to be committed git commit with another message add third file to your project. Now of course, you would probably be doing something more descriptive than what we're doing with these sample files, but now you can see an example of this third file being committed, git status, now it'll report to us that there's nothing to commit, our working directory is clean, git log shows us all three of those comments, and we have all three of the files in our projects.

So these three files are now in the repository exactly as they are in our working directory, the two are exactly the same, and if we made changes to them it reported to us using git status. In the next movie that's what we'll do, we will see how to make changes to these files and how those get reported and how we commit those changes.

Show transcript

This video is part of

Image for Git Essential Training
Git Essential Training

89 video lessons · 28748 viewers

Kevin Skoglund
Author

 
Expand all | Collapse all
  1. 2m 46s
    1. Introduction
      1m 7s
    2. How to use the exercise files
      1m 39s
  2. 20m 24s
    1. Understanding version control
      4m 48s
    2. The history of Git
      7m 58s
    3. About distributed version control
      5m 4s
    4. Who should use Git?
      2m 34s
  3. 26m 12s
    1. Installing Git on a Mac
      3m 44s
    2. Installing Git on Windows
      5m 37s
    3. Installing Git on Linux
      1m 30s
    4. Configuring Git
      7m 29s
    5. Exploring Git auto-completion
      5m 35s
    6. Using Git help
      2m 17s
  4. 15m 49s
    1. Initializing a repository
      1m 58s
    2. Understanding where Git files are stored
      2m 34s
    3. Performing your first commit
      2m 4s
    4. Writing commit messages
      5m 22s
    5. Viewing the commit log
      3m 51s
  5. 17m 44s
    1. Exploring the three-trees architecture
      3m 57s
    2. The Git workflow
      3m 15s
    3. Using hash values (SHA-1)
      4m 7s
    4. Working with the HEAD pointer
      6m 25s
  6. 25m 52s
    1. Adding files
      5m 59s
    2. Editing files
      3m 56s
    3. Viewing changes with diff
      3m 35s
    4. Viewing only staged changes
      2m 28s
    5. Deleting files
      5m 29s
    6. Moving and renaming files
      4m 25s
  7. 19m 18s
    1. Introducing the Explore California web site
      2m 2s
    2. Initializing Git
      3m 48s
    3. Editing the support phone number
      6m 20s
    4. Editing the backpack file name and links
      7m 8s
  8. 38m 45s
    1. Undoing working directory changes
      3m 49s
    2. Unstaging files
      2m 37s
    3. Amending commits
      4m 50s
    4. Retrieving old versions
      4m 7s
    5. Reverting a commit
      3m 12s
    6. Using reset to undo commits
      3m 44s
    7. Demonstrating a soft reset
      4m 8s
    8. Demonstrating a mixed reset
      4m 7s
    9. Demonstrating a hard reset
      5m 8s
    10. Removing untracked files
      3m 3s
  9. 27m 22s
    1. Using .gitignore files
      8m 23s
    2. Understanding what to ignore
      4m 47s
    3. Ignoring files globally
      4m 49s
    4. Ignoring tracked files
      5m 26s
    5. Tracking empty directories
      3m 57s
  10. 26m 51s
    1. Referencing commits
      4m 52s
    2. Exploring tree listings
      3m 46s
    3. Getting more from the commit log
      7m 38s
    4. Viewing commits
      4m 4s
    5. Comparing commits
      6m 31s
  11. 39m 35s
    1. Branching overview
      4m 56s
    2. Viewing and creating branches
      2m 57s
    3. Switching branches
      2m 58s
    4. Creating and switching branches
      4m 53s
    5. Switching branches with uncommitted changes
      3m 26s
    6. Comparing branches
      4m 28s
    7. Renaming branches
      2m 28s
    8. Deleting branches
      4m 18s
    9. Configuring the command prompt to show the branch
      9m 11s
  12. 28m 32s
    1. Merging code
      3m 11s
    2. Using fast-forward merge vs. true merge
      6m 49s
    3. Merging conflicts
      7m 26s
    4. Resolving merge conflicts
      7m 5s
    5. Exploring strategies to reduce merge conflicts
      4m 1s
  13. 14m 34s
    1. Saving changes in the stash
      4m 5s
    2. Viewing stashed changes
      2m 39s
    3. Retrieving stashed changes
      4m 24s
    4. Deleting stashed changes
      3m 26s
  14. 1h 5m
    1. Using local and remote repositories
      6m 38s
    2. Setting up a GitHub account
      5m 39s
    3. Adding a remote repository
      4m 0s
    4. Creating a remote branch
      4m 3s
    5. Cloning a remote repository
      4m 26s
    6. Tracking remote branches
      4m 5s
    7. Pushing changes to a remote repository
      5m 8s
    8. Fetching changes from a remote repository
      5m 47s
    9. Merging in fetched changes
      4m 50s
    10. Checking out remote branches
      3m 22s
    11. Pushing to an updated remote branch
      2m 6s
    12. Deleting a remote branch
      3m 8s
    13. Enabling collaboration
      3m 40s
    14. A collaboration workflow
      8m 43s
  15. 16m 23s
    1. Setting up aliases for common commands
      5m 14s
    2. Using SSH keys for remote login
      2m 56s
    3. Exploring integrated development environments
      1m 4s
    4. Exploring graphical user interfaces
      4m 32s
    5. Understanding Git hosting
      2m 37s
  16. 55s
    1. Goodbye
      55s

Start learning today

Get unlimited access to all courses for just $25/month.

Become a member
Sometimes @lynda teaches me how to use a program and sometimes Lynda.com changes my life forever. @JosefShutter
@lynda lynda.com is an absolute life saver when it comes to learning todays software. Definitely recommend it! #higherlearning @Michael_Caraway
@lynda The best thing online! Your database of courses is great! To the mark and very helpful. Thanks! @ru22more
Got to create something yesterday I never thought I could do. #thanks @lynda @Ngventurella
I really do love @lynda as a learning platform. Never stop learning and developing, it’s probably our greatest gift as a species! @soundslikedavid
@lynda just subscribed to lynda.com all I can say its brilliant join now trust me @ButchSamurai
@lynda is an awesome resource. The membership is priceless if you take advantage of it. @diabetic_techie
One of the best decision I made this year. Buy a 1yr subscription to @lynda @cybercaptive
guys lynda.com (@lynda) is the best. So far I’ve learned Java, principles of OO programming, and now learning about MS project @lucasmitchell
Signed back up to @lynda dot com. I’ve missed it!! Proper geeking out right now! #timetolearn #geek @JayGodbold
Share a link to this course

What are exercise files?

Exercise files are the same files the author uses in the course. Save time by downloading the author's files instead of setting up your own files, and learn by following along with the instructor.

Can I take this course without the exercise files?

Yes! If you decide you would like the exercise files later, you can upgrade to a premium account any time.

Become a member Download sample files See plans and pricing

Please wait... please wait ...
Upgrade to get access to exercise files.

Exercise files video

How to use exercise files.

Learn by watching, listening, and doing, Exercise files are the same files the author uses in the course, so you can download them and follow along Premium memberships include access to all exercise files in the library.


Exercise files

Exercise files video

How to use exercise files.

For additional information on downloading and using exercise files, watch our instructional video or read the instructions in the FAQ.

This course includes free exercise files, so you can practice while you watch the course. To access all the exercise files in our library, become a Premium Member.

Join now "Already a member? Log in

Are you sure you want to mark all the videos in this course as unwatched?

This will not affect your course history, your reports, or your certificates of completion for this course.


Mark all as unwatched Cancel

Congratulations

You have completed Git Essential Training.

Return to your organization's learning portal to continue training, or close this page.


OK
Become a member to add this course to a playlist

Join today and get unlimited access to the entire library of video courses—and create as many playlists as you like.

Get started

Already a member?

Become a member to like this course.

Join today and get unlimited access to the entire library of video courses.

Get started

Already a member?

Exercise files

Learn by watching, listening, and doing! Exercise files are the same files the author uses in the course, so you can download them and follow along. Exercise files are available with all Premium memberships. Learn more

Get started

Already a Premium member?

Exercise files video

How to use exercise files.

Ask a question

Thanks for contacting us.
You’ll hear from our Customer Service team within 24 hours.

Please enter the text shown below:

The classic layout automatically defaults to the latest Flash Player.

To choose a different player, hold the cursor over your name at the top right of any lynda.com page and choose Site preferencesfrom the dropdown menu.

Continue to classic layout Stay on new layout
Exercise files

Access exercise files from a button right under the course name.

Mark videos as unwatched

Remove icons showing you already watched videos if you want to start over.

Control your viewing experience

Make the video wide, narrow, full-screen, or pop the player out of the page into its own window.

Interactive transcripts

Click on text in the transcript to jump to that spot in the video. As the video plays, the relevant spot in the transcript will be highlighted.

Are you sure you want to delete this note?

No

Your file was successfully uploaded.

Thanks for signing up.

We’ll send you a confirmation email shortly.


Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

Keep up with news, tips, and latest courses with emails from lynda.com.

Sign up and receive emails about lynda.com and our online training library:

Here’s our privacy policy with more details about how we handle your information.

   
submit Lightbox submit clicked
Terms and conditions of use

We've updated our terms and conditions (now called terms of service).Go
Review and accept our updated terms of service.