GIT
Collaboration and Time-Travel
What is GIT?
"Git is a free and open source distributed version control system "
What is a DVCS?
A version control system (VCS):
- is used to manage changes of documents
- helps with sharing code
- enables to work in parallel
What is a DVCS?
"Distributed" means:
- It can be used without a central server
- It can be used when offline
- Everyone has a full copy of everything
How does it work?
"Add first cool feature"
"First commit"
9e3ba945cfb7e06dc931eeccb495d9b3efaf5839
"Add hello world app"
41ba3f034fbdb3c253ea906b6e5c1efb9f26f612
83b57ffd5e350f4f41d8e5ca8d6eaed56c82494e
C
B
A
What else is there?
"Add first cool feature"
"First commit"
9e3ba945cfb7e06dc931eeccb495d9b3efaf5839
"Add hello world app"
41ba3f034fbdb3c253ea906b6e5c1efb9f26f612
83b57ffd5e350f4f41d8e5ca8d6eaed56c82494e
HEAD
master
Basic commands
git init
git clone <url>
Basic commands
git status
Basic commands
git status
Basic commands
git log
Basic commands
git log --decorate --oneline --graph --abbrev-commit
git show f4b20e7
Basic commands
GUIs for git: git-scm.com/downloads/guis
Basic commands
git add <file>
Basic commands
git commit -m "commit message"
Basic commands
git push
Basic commands
git fetch
git pull --no-edit
Basic commands
Result of pull:
Basic commands
git pull --rebase
Typical collaboration issues
Someone else pushed since your last pull
Typical collaboration issues
Someone else pushed since your last pull
Typical collaboration issues
Someone else pushed since your last pull
Typical collaboration issues
Someone else pushed since your last pull
Typical collaboration issues
Someone else pushed since your last pull
GIT - Collaboration and Time-Travel
By Felix Bruckmeier
