Autoplay
Autocomplete
Previous Lesson
Complete and Continue
Git Complete: The Definitive, Step-By-Step Guide
Introduction
Welcome and Course Goals (1:30)
Course Overview (2:20)
About the Author / Instructor (1:02)
Course Audience and Course Study Tips (2:47)
Why Command Line? (2:29)
Why Source Control? (5:52)
Why Git? (2:12)
Key Git Terminology (2:59)
Git Installation
Installation Overview (2:12)
Installing Git for Windows (2:20)
Installing Git on Mac OS X (2:29)
Git Quick Start
Quick Start, Part 1: Starting with GitHub and Project Setup (5:30)
Quick Start, Part 2: Configuration, Clone, and Git Basic Workflow (9:05)
Quick Start Resources
Text Editor Installation
Text Editor Installation Overview (1:10)
Windows Text Editor: Notepad++ Installation (6:22)
Configure Notepad++ with Git (Windows Only) (4:39)
Mac Text Editor: TextMate 2 Installation (7:01)
Configure Text Mate 2 with Git (Mac Only) (2:39)
Text Editor Resources
Basic Git Commands
Basic Commands Overview (1:57)
Starting with a Fresh Project (git init) (8:01)
Adding Git to an Existing Project (git init) (6:58)
Starting on GitHub by Joining an Existing Project (git clone) (6:01)
Basic Git Workflow (add, commit, pull & push) (11:27)
Tracked Files (5:09)
Editing Files (3:59)
Recursive Add (4:13)
Backing Out Changes (4:27)
Renaming and Moving Files (11:14)
Deleting Files (10:17)
History (6:27)
Git Alias (4:23)
Ignoring Unwanted Files and Folders (7:22)
Cleanup and Back to Origin (GitHub) (2:38)
Git Basics Resources
Visual Merge/Diff Tool Installation
Visual Merge / Diff Tool Installation Overview (1:00)
P4Merge Install on Windows (5:37)
P4Merge for Windows Git Configuration (4:54)
P4Merge for Mac Installation (3:16)
P4Merge for Mac Git Configuration (6:20)
Visual Merge / Diff Tool Resources
Comparisons
Git Repository Setup (for comparing examples) (5:52)
Comparing Working Directory and the Staging Area (2:29)
Comparing Working Directory and Git Repository (Last Commit) (1:49)
Comparing between the Staging Area and the Git Repository (Last Commit) (1:43)
Limiting Comparsons to one File (or path) (1:59)
Comparing Between Commits (4:37)
Comparing Between Local and Remote Master Branches (2:05)
Comparison Section Cleanup and Push back to GitHub (1:37)
Branching and Merging
Branching Basics (4:48)
Happy Path / Fast Forward Merges (6:44)
Happy Path / Disable Fast Forward Merges (4:12)
Automatic Merges (5:30)
Conflicting Merges and Resolution (11:40)
Section Cleanup and Push back to GitHub (1:37)
Rebasing
Simple Rebase Example (8:21)
Setup for rebasing conflict (2:50)
Abort a Rebase (2:06)
Rebase Conflict and Resolution (4:04)
Pull with Rebase (GitHub) (4:52)
Section Cleanup and push to GitHub (1:53)
Stashing
Simple Stash Example (5:55)
Stashing Untracked Files and Using Pop (5:23)
Managing Multiple Stashes (5:53)
Stashing into a Branch (5:46)
Section Cleanup and push to GitHub (1:22)
Stashing Section Resources
Bonus: Resources and Special Offers
Special Offers for Existing Students
Configure Text Mate 2 with Git (Mac Only)
Lesson content locked
If you're already enrolled,
you'll need to login
.
Enroll in Course to Unlock