Git - I'm lovin' it

A short presentation about using git for beginners

Transcript

1. Git I'm lovin' it!
2. My University Life
3. Introducing... Version Control • What changed? • Who changed? • When did it change? • Why did it change?
4. Traditional Version Control • SLOW • COMPLICATED to branch • Branches are COPIES • Merging is ANNOYING • SLOW • Not always free • Requires a centralized server • Can't always work offline A new world of PAIN
5. Why you should love git
7. Git == AWESOME • FAST • Developers can work offline • Local Control • Much smaller compared to other repos, e.g: Mozilla (SVN), 30x smaller • Branches carry their entire history • DECENTRALIZED • ANY workflow is possible
8. How fast? Source: http://git-scm.com/about/small-and-fast pretty fast...
9. Getting Started
10. git config --global user.email <email> git config --global user.name <name> * sometimes, git config --local
11. git init 8:45 ➜ restaurant> git init Initialized empty Git repository in /Users/amirf/restaurant/.git/ 8:45 ➜ restaurant git:(master) ✗> Master is not special, it's just the default.
12. git clone 8:45 ➜ git clone git@git.assembla.com:funky-repo.git
13. 3 types of files
14. untracked and not staged
15. staged
16. committed (added)
17. git add --all git add . git add <file>
18. git status 8:52 ➜ restaurant git:(master) ✗ git status # On branch master # *snip snip* # # new file: rest_task1.c # 8:54 ➜ restaurant git:(master) ✗
19. git commit also - git commit -m <message> change last message - git commit --amend
20. What is a commit? a 40 digits b107591703f6e5c767ee6bc34c3b19000672be8f SHA
21. git push git push origin <branch> 8:45 ➜ git push origin master
22. What is HEAD? A reference to the last commit in the current branch
23. git pull git pull origin <branch> 9:45 ➜ git pull origin master
24. Basic Training Complete!
25. BRANCHING
26. git branch <name> 9:45 ➜ git branch new-feature
27. What is a branch? A reference to the head of work somewhere
28. git checkout <name> 9:45 ➜ git checkout new-feature Switched to branch new-feature
29. git checkout -b <name> Actually wraps: git branch <name> git checkout <name>
30. git log [-p]
31. git diff <file>
32. git merge <name> 9:45 git:(master) ➜ git merge new-feature 9:45 git:(master) ➜ git merge remotes/origin/new-feature
33. git stash ➜ git stash save ➜ git stash list ➜ git stash pop ➜ git stash apply stash@{0} ➜ git stash drop stash@{0} the 'stash
34. git cherry-pick <commit>
35. git blame <file>
36. git reset --hard <commit> git reset --soft <commit>
37. DEMO TIME! Let's create a repository and do some branching, merging and revet. ...and then let's do it on plugins-repo.
38. There's more Much, more. clean, fetch, tag, describe, rebase, stash, revert - and many, many more.
39. To summerize
40. Resources Google. Thanks!