Git Complete

Git Complete

by Jason Taylor
Released March 2017
Publisher(s): Packt Publishing
ISBN: 9781787123618

Read it now on the O’Reilly learning platform with a 10-day free trial.

O’Reilly members get unlimited access to books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.

Start your free trial

Video description

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.

What You Will Learn

  • Learn the key concepts of the Git source control system~Step through the entire Git workflow
  • Compare the different states in Git and compare between branches and commits~Manage files with Git (move, rename, delete) and update files managed outside Git
  • Create and fork repositories on GitHub and push changes back after working after working on them locally
  • Create branches and resolve merge conflicts like a pro

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.

About The Author

Jason Taylor: With nearly 20 years of programming and software development experience, I started out teaching myself programming while in High School. I put myself through college working for a local Internet Service Provider as a programmer. Before finishing college, I developed and sold an award winning website to a Dot-Com start-up. After college, I have worked at several companies ranging from start-ups to large enterprises focusing on Java and client-side technologies (HTML/CSS/JavaScript). Throughout my career, I have opportunity to learn many software development best practices and exposure to several version control systems

Table of contents

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

Product information

  • Title: Git Complete
  • Author(s): Jason Taylor
  • Release date: March 2017
  • Publisher(s): Packt Publishing
  • ISBN: 9781787123618