O'Reilly logo

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Git Complete

Video Description

Go from zero to hero with Git source control, step-by-step with easy to understand examples.

About This Video

  • Gain from the vast experience of Jason Taylor and learn the best practices of using Git

  • Use Git on multiple platforms, Windows and Mac

  • Understand all the concepts of source control, right from Branching and Merging to Tagging and Rebasing.

  • In Detail

    This course is designed to be a comprehensive approach to Git, which means no prior knowledge or experience is required but students will emerge at the end with a very solid understanding and hands-on experience with Git and related source control concepts.Beginning with an introduction to Git, the first thing we’ll learn is how to install Git for both Windows and Mac. We’ll then walk through all the foundational commands needed to start a new project managed by Git all the way through making commits, including common file operations like moving and deleting files. With a strong foundation in place, we explore ways to make Comparisons in Git, including all the different local states, between commits, and between local and remote repositories. After gaining a strong foundation in branching and merging, we will then cover more complex topics like Rebasing, where we cover how to resolve a rebase conflict.By the end of the course, you’ll have a solid understanding of Git and version control so you can use it in your own projects.

    Table of Contents

    1. Chapter 1 : Introduction
      1. Welcome and Course Goals 00:01:30
      2. Course Overview 00:02:20
      3. About the Author / Instructor 00:01:02
      4. Course Audience and Course Study Tips 00:02:48
      5. Why Command Line? 00:02:30
      6. Why Source Control? 00:05:50
      7. Why Git? 00:02:12
      8. Key Git Terminology 00:02:59
    2. Chapter 2 : Git Installation
      1. Installation Overview 00:02:13
      2. Installing Git for Windows 00:02:20
      3. Installing Git on Mac OS X 00:02:28
    3. Chapter 3 : Git Quick Start
      1. Quick Start, Part 1: Starting with GitHub and Project Setup 00:05:30
      2. Quick Start, Part 2: Configuration, Clone, and Git Basic Workflow 00:09:06
    4. Chapter 4 : Text Editor Installation
      1. Text Editor Installation Overview 00:01:11
      2. Windows Text Editor: Notepad++ Installation 00:06:21
      3. Configure Notepad++ with Git (Windows Only) 00:04:40
      4. Mac Text Editor: TextMate 2 Installation 00:07:02
      5. Configure Text Mate 2 with Git (Mac Only) 00:02:39
    5. Chapter 5 : Basic Git Commands
      1. Basic Commands Overview 00:01:57
      2. Starting with a Fresh Project (git init) 00:08:02
      3. Adding Git to an Existing Project (git init) 00:06:58
      4. Starting on GitHub by Joining an Existing Project (git clone) 00:06:02
      5. Basic Git Workflow (add, commit, pull & push) 00:11:28
      6. Tracked Files 00:05:09
      7. Editing Files 00:03:59
      8. Recursive Add 00:04:13
      9. Backing Out Changes 00:04:27
      10. Renaming and Moving Files 00:11:14
      11. Deleting Files 00:10:18
      12. History 00:06:27
      13. Git Alias 00:04:23
      14. Ignoring Unwanted Files and Folders 00:07:23
      15. Cleanup and Back to Origin (GitHub) 00:02:38
    6. Chapter 6 : Visual Merge/Diff Tool Installation
      1. Visual Merge / Diff Tool Installation Overview 00:01:01
      2. P4Merge Install on Windows 00:05:37
      3. P4Merge Configure on Windows 00:04:54
      4. P4Merge for Windows Git Configuration 00:03:16
      5. P4Merge for Mac Installation 00:06:20
    7. Chapter 7 : Comparisons
      1. Git Repository Setup (for comparing examples) 00:05:53
      2. Comparing Working Directory and the Staging Area 00:02:29
      3. Comparing Working Directory and Git Repository (Last Commit) 00:01:49
      4. Comparing between the Staging Area and the Git Repository (Last Commit) 00:01:43
      5. Comparing between the Staging Area and the Git Repository (Last Commit) 00:02:00
      6. Comparing Between Commits 00:04:37
      7. Comparing Between Local and Remote Master Branches 00:02:06
      8. Comparison Section Cleanup and Push back to GitHub 00:01:37
    8. Chapter 8 : Branching and Merging
      1. Branching Basics 00:04:49
      2. Happy Path / Fast Forward Merges 00:06:44
      3. Happy Path / Disable Fast Forward Merges 00:04:13
      4. Automatic Merges 00:05:30
      5. Conflicting Merges and Resolution 00:11:41
      6. Section Cleanup and Push back to GitHub 00:01:37
    9. Chapter 9 : Rebasing
      1. Simple Rebase Example 00:08:21
      2. Setup for rebasing conflict 00:02:50
      3. Abort a Rebase 00:02:07
      4. Rebase Conflict and Resolution 00:04:05
      5. Pull with Rebase (GitHub) 00:04:50
      6. Section Cleanup and push to GitHub 00:01:54
    10. Chapter 10 : Stashing
      1. Simple Stash Example 00:05:56
      2. Stashing Untracked Files and Using Pop 00:05:23
      3. Managing Multiple Stashes 00:05:53
      4. Stashing into a Branch 00:05:47
      5. Section Cleanup and push to GitHub 00:01:23
    11. Chapter 11 : Tagging
      1. Simple Tag Example / Lightweight Tags 00:02:02
      2. Annotated Tags 00:01:45
      3. Comparing Tags 00:05:04
      4. Tagging a Specific Commit 00:03:48
      5. Tagging: Tagging a Specific Commit 00:02:40
      6. Using Tags with GitHub 00:05:09