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.
Audience
Software engineers, developers and programmers who are new to Git and would like to learn about version control, will find this course interesting. Additionally, Technical leads who are considering version control for their teams, will also benefit from this course. Basic programming knowledge is necessary to get you through the course.
Table of Contents
Chapter 1 : Introduction
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
Chapter 2 : Git Installation
Installation Overview
Installing Git for Windows
Installing Git on Mac OS X
Chapter 3 : Git Quick Start
Quick Start, Part 1: Starting with GitHub and Project Setup
Quick Start, Part 2: Configuration, Clone, and Git Basic Workflow
Chapter 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)
Chapter 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)
Tracked Files
Editing Files
Recursive Add
Backing Out Changes
Renaming and Moving Files
Deleting Files
History
Git Alias
Ignoring Unwanted Files and Folders
Cleanup and Back to Origin (GitHub)
Chapter 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
Chapter 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)
Comparing between the Staging Area and the Git Repository (Last Commit)
Comparing Between Commits
Comparing Between Local and Remote Master Branches
Comparison Section Cleanup and Push back to GitHub
Chapter 8 : Branching and Merging
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
Chapter 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
Chapter 10 : Stashing
Simple Stash Example
Stashing Untracked Files and Using Pop
Managing Multiple Stashes
Stashing into a Branch
Section Cleanup and push to GitHub
Chapter 11 : Tagging
Simple Tag Example / Lightweight Tags
Annotated Tags
Comparing Tags
Tagging a Specific Commit
Tagging: Tagging a Specific Commit
Using Tags with GitHub