Git Primer

A primer on using Git with comparisons made to SVN. Also slides on an effective Git Workflow (by nvie)

Transcript

1. Git > SVN ..and most other VCS
2. whygitisbetterthanx? awesome branching! the staging area it's local! fast, small, distributed... http://thkoch2001.github.com/whygitisbetter/ http://whygitisbetterthanx.com
3. setup... git config --global user.name "Keith Mascarenhas" git config --global user.email "keith.mascarenhas@efinlab.com" git config --global color.ui true
4. lets begin! cd app git init
5. local staging.. Make changes to app.. git status OR git diff git add . git commit -m 'made xyz change'
6. useful git add shortcuts.. git add . [stages modified and deleted, without new] git add -u [stages new and modified, without deleted] git add -A [stages All]
7. branching! ^^ git branch <new_branch_name> [creates branch] git checkout <branch_name> [switch current working directory to this branch] 'master' is our default root branch.
8. branching! ^^ git checkout master + git branch issue53 + git checkout issue53 = git checkout -b issue53 master git checkout -b [new branch name] [source branch name]
9. merging! ^^ git checkout master git merge issue53
10. deleting branches.. git branch -d <branch_name> [Recommended]
11. lets work remote!
12. now clone it! [svn checkout] git clone git@efl.unfuddle.com:efl/app-dev.git
13. [svn commit] Make changes in xyz.. git commit -am "changed xyz" git push <-> [svn commit] git push origin master git push [remote_name] [branchname_you_want_to_commit]
14. [svn update] git fetch + git merge origin/master = git pull git pull origin/master <-> [svn update] git pull origin [branch_name]
15. push a branch to remote! git checkout -b issue53 branch_x git commit git push origin issue53 Someone else.. git fetch
16. tagging.. git tag -a v1.0 git tag [list them] git tag -l 'v1.4.2.*' v1.4.2.1 v1.4.2.2 v1.4.2.3 v1.4.2.4 git show v1.0 git push origin --tags
17. misc.. git log [--oneline] [--graph] [--all] [--stat] git config --global alias.lolz "log --oneline --graph - all" git lolz --decorate git config --global alias.co "checkout" git log issue53 ^master [incoming: origin/master ^master] git log issue52 ^issue53 [outgoing: master ^origin/master]
18. git roundup!
19. git config
20. git init
21. git clone
22. git status
23. git add
24. git commit
25. git branch
26. git checkout
27. git merge
28. git push
29. git fetch
30. git merge
31. our workflow thanks to Vincent Driessen (http://nvie.com/posts/a-successful-git- branching-model/)
32. (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
33. (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
34. don't freak out! (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
35. don't freak out! (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
36. (app-dev) (app-dev) (app-prod) main branches app85 app87 app89
37. feature branches Creating a feature branch When starting work on a new feature, branch off from the develop branch. $ git checkout -b myfeature develop Switched to a new branch "myfeature" Incorporating a finished feature on develop Finished features may be merged into the develop branch definitely add them to the upcoming release: $ git checkout develop Switched to branch 'develop' $ git merge --no-ff myfeature Updating ea1b82a..05e9557 (Summary of changes) $ git branch -d myfeature Deleted branch myfeature (was 05e9557). $ git push origin develop feature: branch off develop merge back into develop name: anything except: master, develop, hotfix-*, release-*
38. (app-dev) (app-prod) --no-ff? app85 app87
39. release & hotfix branches (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
40. release: branch off develop merge back into develop & master name: release-* hotfix: branch off master merge back into develop & master name: hotfix-* (app-prod) (app-stg) (app-dev) app85 app85.0.1 app87
41. thats it!
42. you dont need to rtfd but it helps.. gitref.org git-scm.com/docs Introduction to Git - Scott Chacon bit.ly/introtogit bit.ly/introtogitdeck Branching Model bit.ly/branchingmodel This awesome deck! http://bit.ly/thisdeck