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

Editing the backpack file name and links

From: Git Essential Training

Video: Editing the backpack file name and links

In this movie we're going to make another edit to the Explore California site, and that is that we're going to rename one of our HTML files. From the root of the web site if you go to the menu for Tours, you open that up, scroll down the first tour here, it's called Backpack Cal. It has a nice little graphics are called Backpack Cal. The learn more link will take you to information about it, Backpack Cal, but notice that the name of the file up here is tour_detail_backpack, and that's it. It doesn't say Backpack Cal. And I'm thinking that there maybe a lot of things that are tour_detail_backpack in the future. We could have lots of backpacking adventures.

Editing the backpack file name and links

In this movie we're going to make another edit to the Explore California site, and that is that we're going to rename one of our HTML files. From the root of the web site if you go to the menu for Tours, you open that up, scroll down the first tour here, it's called Backpack Cal. It has a nice little graphics are called Backpack Cal. The learn more link will take you to information about it, Backpack Cal, but notice that the name of the file up here is tour_detail_backpack, and that's it. It doesn't say Backpack Cal. And I'm thinking that there maybe a lot of things that are tour_detail_backpack in the future. We could have lots of backpacking adventures.

We need to be more specific. So we're going to change this file name to be tour_detail_backpack_cal so that it matches what's on the rest of the page. So that's going to involve renaming the file and also changing some content on some of the pages where we have links to this file. The very common sort of task that one might do within an HTML web site. So from inside my project I could just rename this file. I could go into the operating system and rename the file, but I think it's better to do the rename from inside git so there's no changes to my working directory right now.

Let's do the rename git move, and it's going to be inside the tours directory and the tour_detail_backpack.html that's its current name. We're going to move it to tours/tour_ detail_backpack_cal.html. So that moved it. If we take a look here we see that it's moved. In the project it shows it's moved. If we were to go to it in the finder we'd see it was moved as well, and if we do git status, it now shows it in the staged items that the item has been renamed.

So now we need to track down all the link references to this HTML page. So we'll do that with a global search I'll look for everything that was _backpack.html _backpack.html. You see came up with three instances I'm going to click on those three instances so that they open up for me and those are the ones I'm going to change. So here's the first one backpack_cal, save it, and close it. This one is right backpack_cal, save it, close, and the last one save it and close it. So I made those three changes. If we do our global search for backpack. html we don't find any, and if we do a search for backpack_cal, we see that all three are there.

So now we've changed our working directory, git status. So our working directory has those three changes in it. Our staging index has the rename in it. Now I want to make sure that something is super clear to you, which is, that if we go right now without committing anything to our repository, if we go right now to Firefox, and we take a look at this let's go to the top-level Explore California, Tours here's the tour. The learn more link, notice where it's going to take me. You can see it at the very bottom of my screen, or I'll go ahead and go there, and you can see it up here. It takes me to backpack_cal.

It changed the link already. Just make sure that that super clear to you. Our working directory is what we're working with. So that's what we're looking at in the browser. The browser has nothing to do with what's in the repository or what's in staging directory. It's about what's on the file system. So that is our working directory as we change files we see them right away in the browser. So we change them we've look at them again, we see if they're right. If you're doing something besides web, if you're compiling code, you can compile your code to see if it runs, but once you've got exactly like you want you want, maybe you're restyling the page or something and everything looks just right, then we can come over to git and say, okay git, I've now got my working directory in a state that's ready to commit, I'm ready to commit it.

I just want to make sure that you realize that your working directory is what you're working with all the time. That's what you're seeing. What's happening in the staging and the repository are just for git to use, they're not something that you can work with from your browser or compile and any thing like that. You've to bring changes into your working directory in order be able to work with them. So now we're ready to make commits, let's go ahead and do git add, and let's add tours.html. So now it added tours to the list. We also want to add these two files that we made changes to.

They're both in the same directory, the tours directory. We can actually just say git add tours and then usually put the slash after it to make sure it knows it's a directory and everything that's inside of it, you also put the asterisk after it, which lets it know everything inside of is a wildcard, but you don't have to. Add everything in the tours directory to the staging area, git status. Let me clear my screen so you can see it better, and now we see those things there. Notice that we don't see separate entries for the rename that we did and for the changes that we've made from one file to other. Is it peculiar? I needed you to be aware of.

We made changes to the file detail_backpack, we've changed the URL in it. But git reports it to us as just being a rename, in this case. Let's say that we're about ready to do our commit and suddenly we get a phone call from the client and the client tells us that we've need to change something on the Contact page that on the account page there are all these contractions. So we want take out all those contractions. So let's switch over here while we've got the client on the phone, we go ahead and just make sure that we've got it all straight, and we say if you are on this page, we are guessing you have got something to say! Drop us a line.

If you are looking for our seasonal tours--take out that extra space--and (we do not publish these for everyone!), but we will be sure to throw in some cool discounts if you are currently on a tour. So there we've taken out all the contractions and turn them into--oops, I missed one here, let us know what you are thinking. So we've got them all now. I'm going to save that. We come back over here to git, git status. Now we've got this additional change here that we've made to the Contact page.

So we get off the phone with the client, we've now made the changes, and we're ready to deal with it in git. The best practice here is to deal with these as two separate commits. You wouldn't want to add contact into the commit that you are making about tours, because the one about tours is about something different, and we want to try and make our commits related to each other. There's no need for us to break those top three files down any further. They're all related, they are all one conceptual change that we're making at that time. But the conceptual change that we're making to contact is a different one.

So let's make them as two different commits. So we're going to say git commit -m and the first commit is going to be, "Renamed Backpack Cal file for clarity". And then right afterwards we will do git commit--and remember I told you the shortcut, git commit -a with an m after it--and then we'll say, "Removed contractions from contact page text", and now we've made that one git status.

Our working directory is clean, git log, and we can see both of our commits that we've made. Now it's very clear what each one of those commits is doing, the goal that each one is trying to achieve. It takes practice to learn how to group files together and to write good commits for them. But you'll get better at it over time.

Show transcript

This video is part of

Image for Git Essential Training
Git Essential Training

89 video lessons · 30337 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.