Understanding Git

SCMS

• e.g. Git, SVN, Bazaar, Darcs, Mercurial, etc.

• Allow for

  • Version history
  • Rollbacks
  • Shared development
  • Diagnostic assistance
  • Rationale capture
  • Nonlinear development

• Structure

  • Repo: Organized collection of commits
  • Working Directory

• Two kinds

  • Centralized
  • Distributed

Git

• De facto standard for OSS: esp GitHub

• Horrible learning curve

• You should be familiar with:

  • Basic setup
  • Connecting with Github
  • pull, push, commit, branch/checkout merge

Git Resources

• Official Git Manual

• Git Tutorial (manpage)

• Random

  video

• Free online Pro Git book

Git Best Practices

• Start early
• Idealized vs realistic history

• Workflow

  • Pull at start of session
  • Commit often
  • Push when changes should be visible to world