Start learning with our library of video tutorials taught by experts. Get started

Git Essential Training

Editing the support phone number


From:

Git Essential Training

with Kevin Skoglund

Video: Editing the support phone number

In this movie we are going to start making edits to our explore_california web site, to get a feel for what real world edits might look like. So to start us off, we are going to edit the 24-hour support contact number. We come down here to the bottom of the page. You will see at the Contact, this is 24 hour support number at the bottom, and it's listed as being 4315. We are going to change that to 4314. Now it's at the bottom of every single HTML page in the footer. It's also listed in the text sometimes like on the Contact page. It's listed here on a paragraph of text. So we are going to want to change all of those.
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

Watch this entire course now—plus get access to every course in the library. Each course includes high-quality videos taught by expert instructors.

Become a member
Please wait...
Git Essential Training
6h 26m Beginner Aug 24, 2012

Viewers: in countries Watching now:

The course shows how to use Git, the popular open-source version control software, to manage changes to source code and text files. Using a step-by-step approach, author Kevin Skoglund presents the commands that enable efficient code management and reveals the fundamental concepts behind version control systems and the Git architecture. Discover how to track changes to files in a repository, review previous edits, and compare versions of a file; create branches to test new ideas without altering the main project; and merge those changes into the project if they work out. The course begins by demonstrating version control in a single-user, standalone context, before exploring how remote repositories allow users to collaborate on projects effectively.

Topics include:
  • Exploring the history of version control
  • Installing Git on Mac, Windows, and Linux
  • Initializing a repository
  • Writing useful commit messages
  • Understanding the Git three-tree architecture
  • Tracking when files are added, edited, deleted, or moved
  • Viewing change sets and comparing versions
  • Undoing changes and rolling back to previous versions
  • Ignoring changes to select files
  • Creating and working with code branches
  • Merging branches and resolving merge conflicts
  • Stashing changes for later
  • Working with hosted repositories and remote branches
  • Developing an effective collaboration workflow
Subject:
Developer
Software:
Git GitHub
Author:
Kevin Skoglund

Editing the support phone number

In this movie we are going to start making edits to our explore_california web site, to get a feel for what real world edits might look like. So to start us off, we are going to edit the 24-hour support contact number. We come down here to the bottom of the page. You will see at the Contact, this is 24 hour support number at the bottom, and it's listed as being 4315. We are going to change that to 4314. Now it's at the bottom of every single HTML page in the footer. It's also listed in the text sometimes like on the Contact page. It's listed here on a paragraph of text. So we are going to want to change all of those.

So you could go in and open up each one those files and change them one by one. I am going to use TextMate to edit the project altogether. So I can drive the folder on top of TextMate, it opens it up as a project, and the big advantage to doing that is then I can do Find in Project and find all occurrences of 4315 in the entire project. Double-check them, make sure that they are all relevant, that none of them are something besides the support phone number, and then I can change them all to 4314 using Replace All. Now it's changed them all, but it hasn't saved those changes to disk yet.

I have to use Save All to do that. Now all those changes are saved in my working directory. Not in a staging index, not in the repository, just in my working directory. If we come back over here, and we do git status, you will see that it lists now all those files as having been changed. Now before we commit them I want to show you something, which is we saw how we could use git diff before, and we saw we could use it with single file like contact.html. Let's take a look at that diff. Notice a couple of things. Notice first of all that it gives us two chunks that were changed here.

One chunk up above, one below. This one is showing us starting at line 71, seven lines. So here is line 71, countdown seven lines. Now you will actually count eight lines, because this line is in the minus section, while this line is in the plus section and the plus section is showing me from line 71, seven lines. So this line here that's changed is showing twice. Seven lines one of them is repeated twice making eight lines total. Same thing down here. Now these line numbers are very useful, because then we can look over here in our contact file, and we can scroll down until we get to line 71, and that's where our change is, or the context for our change is, if you are on this page.

If you're currently on a tour, is the text that actually changed, that's right here. If you're on a tour. So here is the support phone number that's the bit of text that was changed. Now notice that doesn't show that bit of text is way off over here on the side. If I keep stretching out there, it will try and expand until I get there, but it's such a long line that it won't get there. It's a good reason to try and keep your line short if you can and for HTML it doesn't really care about the line breaks. It's not whitespace dependent. However, the another trick that you can do is that what we are looking at here is actually being run through what's called a pager.

It's showing me pages of results and in fact if I scroll this up like this, you can see that it's now asking me. Here, it's prompting me, waiting for me to hit the spacebar to show me the rest of the results, and I can use F and B to go forwards and backwards through those results. What this is the less pager that's built into UNIX. So I'm using the less pager to see these results. The less pager has a feature where I can either start it up using the -R command, and you can set that in your global configuration or while I'm inside of it I can press the minus key and then Shift+S and then hit Return, and it will fold those long lines.

So to wrap it around instead of having the lines be truncated. And if I want to switch it back -S and Return chops the long lines instead. Now as I said that is something you can use a configuration for in your config file if you wanted to always be that way. So it's really up to you and how you like to work. Notice here we can see the change between these lines really easily, 4315 got changed to 4314. I am going to hit Quit. We are going to do the git diff again just like we did before, but this time I am going to add in an option here which is color-words.

So git diff with the option color-words contact.html. Now notice that it comes up, and it gives me that same information, but instead of having two separate lines it gave me a different format, and it put the change here side by side. This is just one of many options that you can use with a diff to get it to show you information in a different way. So if you prefer instead of saying one line above the other, you prefer having it actually color the output for you so you can see the difference between them, you can use the color-words option. So we have seen enough of that.

We are ready to go back here, and we are ready to make our commit. Right now, these are in our working directory, we haven't staged them yet. We know that we would use git add, and then we could do them one at a time or we could just use git add. and put all of them into the index. I want to instead show you another way to do it. It's a shortcut. From here, we can do git commit with the -a option, that's telling it to add it to the staging index and then commit it. All in one big move. So it's going to add it and commit it and allow us to skip that process of actually having to say add them one by one.

Now there are couples of big caveats to this, and you need to be careful about them. The first is that, of course, this grabs everything that is in your working directory. So if there were some things that you didn't want to include in the change, they're going to get pushed up there as well. The second caveat, is that files that are not tracked, or files that are being deleted, do not get included in this. So it works well for modifications, but for new files and deleted files it doesn't work well. In this case, I'm only making modifications I know that as soon as I finish doing the add of everything, I am going to commit it all, it's okay to do the shortcut. And then I am going to use the -am option after it is well to provide the message, and I am going to say, Changed 24 hour support number to 4314. So there we are.

I have committed my change, git status, you can see that my working directory is clean. It went right from my working directory, right on past the staging index, and into the repository, git log will show us that second commit. So again you should use that -a option very carefully.

Find answers to the most frequently asked questions about Git Essential Training.


Expand all | Collapse all
Please wait...
Q: In the Chapter 10 movie "Configuring the command prompt to show the branch," when I type the function "__git_ps1," I do not get the expected result.
A: The function "__git_ps1" was recently moved to a new file, .git-prompt.sh, as described here: https://github.com/git/git/commit/af31a456b4cd38f2630ed8e556e23954f806a3cc.

We will update the video. In the meantime, you may do the same steps you do for .git-completion.bash, but a second time using ".git-prompt.sh" as shown here: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh.
Share a link to this course
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.
Upgrade now


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.

Upgrade now

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
Welcome to the redesigned course page.

We’ve moved some things around, and now you can



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.

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