git.md

Git

Critical learning

• First, Try Git!
• Watch the Normal Workflow gitcast.
• Watch the Distributed Workflow gitcast.
• Read Chapter 3 of Pro Git.
• Read gitready articles that interest you.

Validation

You know everyday git when you can:

• Initialize a repository
• Clone a repository
• Ignore files
• Add a file to staging
• Unstage a file
• Check status
• View a diff
• Create a commit
• Push to origin
• Pull remote changes locally
• Resolve a conflict
• Create a branch
• Merge a branch into master
• Push to a remote branch
• Rebase origin/master into a branch

You know intermediate git when you can:

• Add a remote
• Amend a commit
• Show a commit by SHA hash
• Stash changes
• Squash commits
• Create a tag

You know advanced git when you can:

• Cherry pick commits
• Reorder commits
• Keep either file in merge conflicts
• Restore lost commits
• Visualize commits differently using git log flags
• Visualize changes differently using git diff flags

Ongoing reference

Refer to these man pages when you start a new project:

man git-clone
man git-init

Refer to these man pages often during a project:

man git-add
man git-branch
man git-checkout
man git-commit
man git-diff
man git-merge
man git-pull
man git-push
man git-rebase
man git-reset
man git-show
man git-stash
man git-status