git is our version control system.

Goals

• Understand why we use git.
• Learn how to work with your local repository:
  • Create a local repository (git init)
  • Commit changes (git commit)
  • See the history (git log)
  • See changes (git diff)
  • Work with branches (git checkout, git checkout -b, git merge)
  • Work with the stash git stash
• Learn how to work with a server:
  • git clone
  • git push
  • git fetch
  • git pull
• Learn to use the tool tig
• Configure your git correctly
• Learn how to use code.makandra
• Learn how to use GitHub

Resources

• Basic tutorial
• Proper git config
• Interactive Git Cheatsheet
• Atlassian Git Cheatsheet
• Integrated help (git help)
• Interactive Git visualization
  Here you get an emulated git shell and a live demonstration of what effects git's commands have. Commits are depicted as circles in a directed graph, branches and tags (refs) as labels.
  To get started, select any of the offered commands or choose "Free Playground"/"Zen Mode".

Exercises

Understanding git concepts

Try and explain:

• Why do we use git at all?
• What is the "workspace"?
• What is the "index"?
• What is the "stash"?
• What is the difference between a local and a remote repository?
• What is a "Fast Forward"?

Play around on code.makandra.de

• Create a repository
• Add some files, and commit them
• Create a branch
• Push changes to the server

Play around on github.com

• Sign up
• Create a repository
• Add some files, push them
• Create a pull request
• Delete the repository when done