part1.md

Git Tutorial Part 1 - Resources

Installation

• Git for Windows
  • Take care to choose the best default editor for you (which is most probably not Vim).
  • Take care to select 'Checkout as-is, commit as-is' to turn off any line ending conversions if you do not explicitly need this feature for cross-platform development.

Lab

• Setting up your own Git environment - totally locally!
  • Git on the Server - The Protocols
  • Setting Up Your Own Git Server

git init --bare demo-repo.git
# The warning 'You appear to have cloned an empty repository.' is normal at this point...
git clone demo-repo.git clone-a
git clone demo-repo.git clone-b

Textual

Basics

• gittutorial - A tutorial introduction to Git
  • Using Git for collaboration
• giteveryday - A useful minimum set of commands for Everyday Git
  • Individual Developer (Standalone)
  • Individual Developer (Participant)

Theory

• Integrating branches
  • Merge branch
  • Rebase branch
• Make local changes with using branches
• Merging vs. Rebasing

Study

• Learn Git Collaboration
• Rewriting history
• Git Immersion - A guided tour that walks through the fundamentals of Git

Visual

Demo

• Upstream Changes
  • Supported operations
  • git commit
  • git pull
  • Results in a merge commit.
  • clear (Not a Git command!)
  • git commit
  • git fetch
  • git rebase origin/feature
  • Alternative with the same Visualization:
    • Visualizing Git Concepts with D3
      • Combine Branches - git merge
        • Try with git checkout ff and git merge dev and with git merge dev only...
      • Combine Branches - git rebase

Eye Candy

• Git Cheatsheet
• A Visual Git Reference
• LearnGitBranching

Hands-On

• Resources to learn Git
• Become a git guru.