New Feature: Playlist Center! Pick a topic and let our playlists guide the way.

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

Git Essential Training
Illustration by

Exploring graphical user interfaces


From:

Git Essential Training

with Kevin Skoglund

Video: Exploring graphical user interfaces

All the interaction we've done with Git so far we've done from the command line, and that really is where Git sort of lives, and it's the best place for you to get started as a beginner and get familiar with those commands. However, some people find that after they've had experience with the basics and they're familiar with the command line, they find that they can actually speed up their workflow by incorporating a graphical user-interface to help them to see the state of the Git project and actually work with Git by using a graphical user-interface instead of typing.
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

Exploring graphical user interfaces

All the interaction we've done with Git so far we've done from the command line, and that really is where Git sort of lives, and it's the best place for you to get started as a beginner and get familiar with those commands. However, some people find that after they've had experience with the basics and they're familiar with the command line, they find that they can actually speed up their workflow by incorporating a graphical user-interface to help them to see the state of the Git project and actually work with Git by using a graphical user-interface instead of typing.

There are number of options available to you for this. The first and simplest is just GitWeb. GitWeb is included with Git. You need to actually set up a web server to be able to do this, so it does requires some amount of technical knowledge, because you do need to be able to set up the web server to host it, but what it does is it let's you see your get repository as a little mini web site. Now that's a pretty basic and limited way of doing it, but it is on the web where it's available for everyone to be able to see which is kind of nice. And on a more personal level though you will probably going to be more interested in a graphical user-interface application that you can download onto your computer.

Let's start by looking at a few of the most popular ones for the Mac. GitX is probably one of the oldest ones, it's been around the longest, GitHub of course we know is the hosting company, they also offer a application client that you can download and use. Now I'll give you a peek at GitX and GitHub just so you get an idea of what a graphical user-interface can do for you. But before we do that let also look at the list of Windows applications. So if you're on Windows, you'll probably want to look at one of these, these are the most popular ones. And again you'll see the GetHub is in that list with their Windows client, and SmartGit actually has one for both, they are cross- platform they offer it for both Mac and for Windows.

Like I said, there are many, many of these and new ones are appearing all the time. There is actually a pretty good list maintained on the Git Wiki, so if you go to git.wiki.kernel.org/index.php/ InterfacesFrontendsAndTools with caps in there, and it'll give you a list of all the different interfaces, front-ends, and tools that are available to you. Based on the popularity of the choices that I showed you earlier though, you probably won't need to go to this very exhaustive list. Let me can give you an idea of what a graphical user-interface can do for you.

So this is GitX, and you can see here that it's showing me this kind of graphical view that I was looking at from the command line, its a little nicer looking here. If I click on any one of these edits, you'll see that it shows me down here what the edit actually looks like, I can switch to look at different branches. I'm on master now, but I can switch and take a look at non-tracking, seo-title, shorten_title, see what those all look like, and I can look at my remotes and see the state of things there. I also have the ability to stage in my commits here. It'll give me a list of all the files that have changed right here, I can select them, and I'll move them over here to the stage changes side.

And then when I'm ready, I can write a commit message and actually do the commit from here as well. Up here this area just shows you the different changes, so you can review them. So as you click on the different files you can review the changes before you stage them and then commit them. Now it's got lots of other features but that does give you an idea of how you're able to see your repository and interact with it from a graphical user-interface. Let's take a look now at GitHub. This is the GitHub Mac client, so here once again, we can see all the different commits I've made. This is essentially my log, the history, if I want to view information about one of those I can just click on the arrow here, it'll take me to more information about it. I can revert the commit from here, go back to my history again.

The changes I can also make from here, uncommitted changes, this is to let me put in my commit message, and then I can select the files that I want to stage and then add with commit, and this is the file viewer over here where I can watch those. I've also got branches here where I can see all the different branches, and I can even go up here to Repository, I can do things like switch branch if I want to quickly just change to my non-tracking branch, now I'm on the non-tracking branch. I don't actually have to check it out, it does it for me just like that. All these graphical user-interfaces all have a different look to them, a different sense of what's important, and probably you'll need to try three or four of them until you find one this sort of feels right to you, but again, as a beginner, I think it's important not to become too dependent on these graphical user interface tools. You want to make sure that your command line knowledge is still solid before you start using them to speed things up for yourself.

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.
Q: When I use the code the instructor advises in the above video ("git config
--global user.name "Nelda Street"), I still get an "Illegal Instruction"
error. I have OS 10.6.8. Am I doing something wrong?
A: The current installer version of git isn't compatible with older Mac OS versions.
 
https://code.google.com/p/git-osx-installer/issues/detail?id=96
 
The workaround solutions people offer are:
 
1. To add "-mmacosx-version-min=10.6" as described here:
https://stackoverflow.com/questions/14268887/what-is-the-illegal-instruction-4-error-and-why-does-mmacosx-version-min-10
 
https://stackoverflow.com/questions/10177038/illegal-instruction-4-shows-up-in-os-x-lion
 
2. Or to use the version of git that comes with Xcode, or to use homebrew to install git instead.
http://superuser.com/questions/697144/installed-git-not-sure-how-to-get-it-working
 
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.
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.

join now 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
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

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.