Working Directory

• Area where all of our files and directories and changes are living all the time

Staging Area

• Files and directories that we explicitly add to the staging area
  • $ git add *.html
  • $ git add .
  • $ git add -A (including hidden)

Git Repository

• Where all our snapshots are stored

Git Branches

• Listing all branches
  • $ git branch
• Adding a branch
  • $ git checkout -b [newBranchName]
• Changing branches
  • $ git checkout [branchName]
• Merging a branch
  • $ git merge [branchName]
• Removing a branch

  • $ git branch -d [branchName]

     /-----0---0----0
    /              /
    

0------0----0----0----0