Git Basics Training

Git Basics Training Outline

• Introduction

  What this course covers

  The need for Version Control

  A brief history of git and what it is (i.e. a DVCS)

  What is DVCS

  Plumbing and Porcelain

  The repository (at high level)

  Getting Started

  Lab Exercises

  • Group discussion, understanding DVCS

• Git Concepts

  Git Object Types

  • Blobs
  • Trees
  • Commits
  • Tags
  • Git Reference Types
  • Object Model Example

  Hash Values (SHA-1)

  The Git Data Model

  Lab Exercises

  • Verify Git Installations
  • Identify the git repository
  • Ask Git for help

• Getting started

  How to create a new Git repository

  Setting up Your Git Environment

  Basic workflow

  Adding new files

  Changing existing files

  Committing changes to the repository

  The Git Log

  Lab Exercises

  • Identify yourself to Git
  • Create a Git repository
  • How to add new files/folders
  • How to commit new files/folders
  • Clone an existing repository
  • Check the status of your Git repository

• Working with Git

  The Status command

  Ignoring file types

  View specific changes

  Removing files & directories

  Moving files & directories

  Stashing Changes

  Undoing or fixing errors

  Reset a change

  Revert a change

  Checkout a change

  Lab Exercises

  • Use the git log command to help you clarify if you are committing the correct version of a file
  • Use the git status command to help you clarify the current state of your repository

• Branching and Merging

  What is a branch

  Creating a branch

  Switching between branches

  What is a merge

  Fast forward merge

  3-way merge

  Resolving merge conflicts

  Merge tools

  Removing branches

  Branch management in Git

  Lab Exercises

  • Create branches in Git
  • Add files to branches
  • Checkout branches
  • Merge into branches
  • Rebase and squash a feature branch

• Collaboration Basics

  Cloning repositories

  Remotes

  Remote Branches and Tracking Branches

  Fetching, Pulling and Pushing Changes

  Bare and development repositories

  Publishing repositories

  Lab Exercises

  • Clone a repository
  • Create or Identify a remote
  • Pull changes
  • Push changes
  • Merging between repositories

• Collaboration Strategies

  Branching Strategies

  Structural Strategies

  Lab Exercises

  • A flexible exercise implementing the strategy you intend to use moving forward

• Tagging

  What is a tag

  Viewing tags

  Creating tags

  Signed tags

  Tagging later

  Sharing tags

  Lab Exercises

  • Create tags in Git
    • Lightweight tags
    • Annotated tags
    • Checkout tags in Git
  • How to view tags
  • How to checkout tags

• Putting It All Together

  This is an open lab exercise which asks students to use what they have learned to implement a scenario.