2. What is git?
1. Source Control Management System (SCM)!
2. Distributed!
3. Speed!
4. Data integrity
http://www-cs-students.stanford.edu/~blynn/gitmagic/ch08.html
9. Squash
git merge —squash <branch>
# Reset the current branch to the commit just before the last 12:
git reset --hard <commit>
!
# HEAD@{1} is where the branch was just before the previous command.
# This command sets the state of the index to be as it would just
# after a merge from that commit:
git merge --squash HEAD@{1}
!
# Commit those squashed changes. The commit message will be helpfully
# prepopulated with the commit messages of all the squashed commits:
git commit
Option 2
Option 1
10. Don’t be evil!
1. Commit often!
2. Check your diffs BEFORE pushing
git diff, Gitk, SourceTree App!
3. Do not add/commit blindly
git add -A .
git commit -m “More styling”!
4. Create Pull Requests often!
5. Branch for everything!
6. Think of what the history will look like!