Find online courses made by experts from around the world.
Take your courses with you and learn anywhere, anytime.
Learn and practice real-world skills and achieve your goals.
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.
Recent Course Updates
Course Introduction and Overview provides an introduction to this course and the Git source control system and sets the stage for the rest of the course.
After the introduction, the first thing we do is Git Installation for both Windows and Mac.
Quick Start a very quick (15 minutes), hands-on introduction to Git. We start off by signing up for GitHub, creating a repository there, the makiing a local copy (clone), local changes (add/commit) and then update GitHub with our changes (push).
In Basic Commands, we walk through all the foundational commands needed to start a new project managed by Git (or enable Git for an existing project) all the way through making commits, including common file operations like moving and deleting files. We also cover how to exclude the wrong files from accidentally being committed and how to review your repository's history.
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.
We give great attending to Branching and Merging in Git. We start off with the simple "happy path" and learn about "Fast-Forward" merges and how to control them. The we walk through common "automatic" merges. Finally, we cause trouble on purpose so we can step through resolving conflicting merges with our visual merge tool.
With a strong foundation in branching and merging, we will then cover a more complex topic, Rebasing. In that section, we cover several rebasing examples, including how to resolve a rebase conflict.
In the Stashing section, we save our work-in-progress while we attend to more pressing issues, then pick up where we left off after that.
NEW: In the Tagging section, we mark important milestones or releases within our project. We also use those tags later for comparing differences between important milestones. We also look at how to use tags within GitHub.
All tools have installation and configuration sections to ensure no one is left behind.
Presentations provide audio/video training of conceptual ideas. Since few like slide-ware presentations, slide-presentations are kept to a minimum.
Screencasts provide a video of the instructor's computer system with any actions, commands, or screens displayed and narrated. There is nearly 4 hours of screencast based video training in order to step through each command or action in sufficient detail.
Several attachments and document lectures throughout the course provide supplemental information, illustrations, or other reference material.
This course will expand periodically to include more topics, supporting materials and bonus content! Some content may be in direct response to student feedback or discussions -- so get engaged with the course discussions feature!
Not for you? No problem.
30 day money back guarantee.
Learn on the go.
Desktop, iOS and Android.
Certificate of completion.
|Section 1: Introduction|
Course introduction, welcome and course goals.
In order to meet the course goals outlined in the previous lecture, this course will follow an outline featured in the lecture.
A brief introduction and information about the author/instructor for this course.
This course has a specific audience in mind -- mainly freelancers, developers, programmers, and other creative professionals.
The majority of the course will be done using the command line (Git Bash / Terminal). This lecture explains why.
Not everyone is convinced of the need for version control -- so I go over the main reasons one should use it.
Once convinced of the need for version control, this lecture goes into Git's unique qualities and why Git is an excellent version control system.
At this point, we assume you plan to use Git for version control and continue with the course, so this lecture goes over some key terminology that will be helpful to understand before moving forward.
|Section 2: Git Installation|
Git Installation section overview and what approach will be taken.
A step-by-step installation of Git on Windows, including recommended options and choices.
A step-by-step installation of Git on the Mac platform (featuring Yosemite).
|Section 3: Git Quick Start|
Part one of the "Quick Start" section -- starting with GitHub and initial project setup.
Part two of the "Quick Start" section -- configuration, cloning from GitHub and the entire Git workflow (add, commit, push and pull).
|Lecture 14||1 page|
Command listings for this section.
|Section 4: Text Editor Installation|
Text Editor Installation Overview
Windows Text Editor: Notepad++ Installation
Configure Notepad++ with Git (Windows Only)
Mac Text Editor: TextMate 2 Installation
Configure Text Mate 2 with Git (Mac Only)
Text Editor Resources
|Section 5: Basic Git Commands|
Basic Commands Overview
Starting with a Fresh Project (git init)
Adding Git to an Existing Project (git init)
Starting on GitHub by Joining an Existing Project (git clone)
Basic Git Workflow (add, commit, pull & push)
Backing Out Changes
Renaming and Moving Files
Ignoring Unwanted Files and Folders
Cleanup and Back to Origin (GitHub)
Git Basics Resources
|Section 6: Visual Merge/Diff Tool Installation|
Visual Merge / Diff Tool Installation Overview
P4Merge Install on Windows
P4Merge Configure on Windows
P4Merge for Windows Git Configuration
P4Merge for Mac Installation
P4Merge for Mac Git Configuration
Visual Merge / Diff Tool Resources
|Section 7: Comparisons|
Git Repository Setup (for comparing examples)
Comparing Working Directory and the Staging Area
Comparing Working Directory and Git Repository (Last Commit)
Comparing between the Staging Area and the Git Repository (Last Commit)
Limiting Comparsons to one File (or path)
Comparing Between Commits
Comparing Between Local and Remote Master Branches
Comparison Section Cleanup and Push back to GitHub
|Section 8: Branching and Merging|
Happy Path / Fast Forward Merges
Happy Path / Disable Fast Forward Merges
Conflicting Merges and Resolution
Section Cleanup and Push back to GitHub
|Section 9: Rebasing|
Simple Rebase Example
Setup for rebasing conflict
Abort a Rebase
Rebase Conflict and Resolution
Pull with Rebase (GitHub)
Section Cleanup and push to GitHub
|Section 10: Stashing|
Simple Stash Example
Stashing Untracked Files and Using Pop
Managing Multiple Stashes
Stashing into a Branch
Section Cleanup and push to GitHub
Stashing Section Resources
|Section 11: Tagging|
Simple Tag Example / Lightweight Tags
Tagging a Specific Commit
Using Tags with GitHub
Tagging Section Resources
|Section 12: Bonus: Office Hour Sessions|
Reset and Reflog (Office Hours, Session 1)
Compare Branches via GitHub (Office Hours, Session 1)
Compare Branches via Command Line (Office Hours, Session 1)
Stash vs Branch (Office Hours, Session 1)
Gitting Help (Office Hours, Session 1)
Cherry Pick (Office Hours, Session 1)
|Section 13: Updates and Errata|
Git Mac OS X Updates
|Section 14: Bonus: Resources and Special Offers|
Bonus: Exclusive Student Discounts