learning git

• One needs to understand the concepts and git’s object model before he can really use git.
• understand diff, patch, and merge.
  
  • 3-way merge
• As to VCS, the hardest part is merging.

terminology

• gitglossary
• Identifier Terminology

git object model

• The Git Object Model from Git Community Book

staging

• tracking new files
• stage changes to already tracked files

tree-ish, commit-ish

• What does tree-ish mean in Git?
• What are commit-ish and tree-ish in Git?

workflows

• gitworkflows Manual Page
• git flow
• github-flow

use gitk for visualization

• gitk manual
• Use gitk to understand git

commands

pull

The “pull” command performs two operations:

• it fetches changes from a remote branch,
• then merges them into the current branch.

Tutorials

• official tutorial 1, 2