Quick History

• Created by Linus Torvalds in 2005.
• Distributed Source Control
• Safeguards against corruption, malicious or accidental.
• Not be CVS

Distributed

• Always committing to local.
• Git can have any number of remote upstreams.
• A branch can be marked as tracking an upstream branch.

Branch branch branch

• Share as often and without limits.
• Isolate your work to stay focused.
• Try different approaches without pushing incomplete features.
• Inherent code review process.

git basics

• Adding, ignoring, staging and committing.
• Branching
• Merging
• Push and pull
• Dealing with Conflicts

Features

• Partial committing
• Local commits
• Pull with rebase
• Easy branch, tag, checkout, revert, cherry pick...
• Diff across branches, commits, etc.

Workflow Overview

• Types of branches
• Production
• Master
• Development

Workflow

Workflow

• git pull origin master

• git checkout -b feature

• merge updated master into feature, play

• merge feature, push, close issue

Best Practices

• Stick to the feature branches.
• Concise commit messages
• Pull with Rebase.
• Useful commits

Useful Commands

• Configure your username/email.

git config --global user.name "John Doe"

git config --global user.email johndoe@example.com

git config branch.autosetuprebase always

Git Tools

• git bash
• eGit
• SourceTree
• git-extras

Useful References

• Git for Ages 4 and Up Presentation given at Linux Conf Au 2013; [1:39:42]
• Brief Interactive git by github.
• Interactive git branching tutorial.
• Git - SVN crash course
• Learn X in Y.
• Git hug, a level based git knowledge test.
• A workflow model
  • Also documented here - Atlassian Tutorial