Git a life

A simple introduction about GIT and versioning.

Transcript

1. GIT A LIFE
2. @MUKKOO
3. @mukkoo
4. @mukkoo
5. @mukkoo
6. VErsioning @mukkoo Version Control System
7. Copy & Paste VCS @mukkoo project/ project_old/ project_old_old/ project_ok/ project_ok_ok/ project_ok_ok_new/ projectOK_ok_ok_new/
8. Centralized VCS @mukkoo CVS, Subversion, Perforce Server Repository Client Client Client Client
9. Distributed VCS @mukkoo Git, Mercurial, Bazaar Hub Repository Server Server Server Server Repository Repository Repository Repository
10. GIT* @mukkoo *idiot
11. Linus Torvalds
12. focus @mukkoo 1. Make the opposite of CVS (SVN) 2. Distributed workflow 3. Safe against file corruption 4. High performance
13. Snapshot not DIFF @mukkoo 0 +2 +4 -3/2 DIFF: Every commit record differences 0 2 6 1,5 SNAPSHOT: Every commit record all file tree
14. Three States @mukkoo Git Directory Working Directory Staging Area Untracked Committed
15. WARNING!!! the hardest part is coming.
16. Branching @mukkoo c1 c2 master HEAD feature
17. Branching @mukkoo c1 c2 master HEAD feature c3 c4 c5 c6 feature2
18. @mukkoo Need fix on master. NOW!
19. Branching @mukkoo c1 c2 master HEAD feature c3 c4 c5 c6 feature2 c7 c8
20. Branching @mukkoo c1 c2 master HEAD feature c3 c4 c7 c8 c9
21. The Theory is Over @mukkoo Are you hungry?
22. Commands @mukkoo
23. INIT @mukkoo $ git init
24. status @mukkoo $ git status show the working tree status
25. ADD @mukkoo $ git add <args> add file to staging area
26. Commit @mukkoo $ git commit -m “message” record changes
27. LOG @mukkoo $ git log Show commits log
28. checkout - - @mukkoo $ git checkout -- <file> Restore a modified file
29. branch @mukkoo $ git branch <branch_name> Create a new branch
30. checkout @mukkoo $ git checkout <branch_name> Move to branch
31. merge @mukkoo $ git merge <branch_name> merge branch
32. DEMO TIME @mukkoo
33. Useful concepts @mukkoo
34. remotes (command and concept) fetch (command) push/pull (commands) @mukkoo Network
35. rebase (command) fast forward (concept) stashing (command) @mukkoo FLOW
36. ignoring files (.gitignore) gitk and git gui (gui tools) shortcut and configs (.gitconfig) @mukkoo Settings and tools
37. Q&A @mukkoo
38. what does Wordpress use? @mukkoo
39. GIT A SLICE of pizza @mukkoo