Git

An overview of Git given to the TrendyMinds crew

Transcript

1. Git
2. "Git is a version control system, a simple command line tool for keeping a history on the state of your source code projects" — Github.com
3. Getting Started
4. $ git config --global color.ui true
5. $ cd ~/Desktop $ mkdir new-project $ cd new-project $ git init
6. Add an index.html with some content
7. $ git add index.html $ git commit -m "Initial commit"
8. Branches
9. $ git checkout -b feature-blog
10. Add 4-5 blog posts in index.html
11. $ git add index.html $ git commit -m "Add blog articles"
12. Remove one of the blog posts
13. $ git add index.html $ git commit -m "Remove a blog article"
14. Merge back into master branch
15. $ git checkout master $ git merge feature-blog $ git log --graph --all $ git branch -d feature- blog
16. Merge using --no-ff
17. $ git checkout -b feature-favfoods $ git add index.html $ git commit -m "Add a list of my favorite foods"
18. $ git checkout master $ git merge --no-ff feature-favfoods $ git log --graph --all $ git branch -d feature- favfoods
19. Recap
20. Workflow
21. Conventions
22. Rule #1: Don't work in the master branch
23. Rule #2: Create topical branches off of master
24. feature-* feature-blog feature-calendar hotfix-* hotfix-navigation-wrapping hotfix-slideshow-animation
25. Rule #3: Small commits, modular merges
26. $ git commit -m "Added half the blog" $ git commit -m "Added blog"
27. $ git checkout -b feature-blog $ git commit -m "Add listing view of blog articles" $ git commit -m "Add sidebar with ability to toggle categories"
28. $ git checkout master $ git merge --no-ff feature-blog $ git branch -d feature- blog
29. Rule #4: Make descriptive commits
30. $ git commit -m "Add some archive stuff" $ git commit -m "Add archive links in sidebar for all areas of the blog"
31. Visual recap
32. master feature-blog
33. Notable items
34. Merge issues
35. .gitignore
36. # Files ending with this extension *.diff *.log *.sass-cache # OS-based files .DS_Store Thumbs.db # Upload directories uploads/ # Image sizer directory sized/ make/
37. Git with a CMS
38. Workshop time
39. bit.ly/10bzKiy
41. $ cd ~/Sites $ git clone [URL] $ cd demo
42. Andre: top five list of fav guilty pleasure songs (fav-guilty-pleasure.html) Allen: top five list of Nintendo 64 games (fav-n64-games.html) Daniel: top five list of fav books without "the" in title (fav-books-without-the.html) David: top five list of fav movies made in 90s (fav-90s-movies.html) Todd: top five list of fav snacks when you were a kid (fav-snacks.html)
43. $ git checkout -b [BRANCH] # Make your changes $ git add [FILES] $ git commit -m "[MESSAGE]" $ git checkout master $ git pull # Grab any team changes $ git merge --no-ff [BRANCH] # Fix any merge issues and commit $ git branch -d [BRANCH] $ git push # Push changes to Beanstalk
44. Homework
45. ?