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 making 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!
This section provides an introduction to the course and covers some basic theory before moving on.
- Welcome and Course Goals
- Course Overview
- About the Author / Instructor
- Course Audience and Course Study Tips
- Why Command Line?
- Why Source Control?
- Why Git?
- Key Git Terminology
- Installation Overview
- Installing Git for Windows
- Installing Git on Mac OS X
- Quick Start, Part 1: Starting with GitHub and Project Setup
- Quick Start, Part 2: Configuration, Clone, and Git Basic Workflow
- Quick Start Resources
- 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
- 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)
- Tracked Files
- Editing Files
- Recursive Add
- Backing Out Changes
- Renaming and Moving Files
- Deleting Files
- Git Alis
- Ignoring Unwanted Files and Folders
- Cleanup and Back to Origin (GitHub)
- Git Basics Resources
- 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
- 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
- Branching Basics
- Happy Path / Fast Forward Merges
- Happy Path / Disable Fast Forward Merges
- Automatic Merges
- Conflicting Merges and Resolution
- Section Cleanup and Push back to GitHub
- Simple Rebase Example
- Setup for rebasing conflict
- Abort a Rebase
- Rebase Conflict and Resolution
- Pull with Rebase (GitHub)
- Section Cleanup and push to GitHub