Minuto Seguros - Git is love second edition

Introduction to Git (remake) - trying to show (again) to my colleagues what a real version control is

Transcript

1. Git é amor v2.0 @LuizFreneda
3. Do you know this guy?
4. (If not)
6. History
7. Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency
8. Who is using? ( http://git-scm.com/ )
9. Snapshot / DAG Distributed & (Directed Acyclic Graph)
10. Delta VS Snapshot
11. Delta storage
12. Delta storage
13. Snapshot storage
14. Snapshot storage
15. • Extremely fast actions • Internet connection is not required • Repository is local Distributed version control
16. Distributed vs Centralized
17. Distributed as Centralized
18. Trees and blobs
19. Commit contains metadata
20. Branchs and Tags points to commit
22. It is just a folder
23. What is each thing?
24. Git stages
25. Git add
26. Git reset
27. Git commit
28. Git commit
29. Git checkout
30. Git checkout
31. Git branch
32. Git merge
35. Git merge
36. Git rebase
38. Hooks Hooks
39. Gitk
40. .gitignore
41. Merge vs Rebase
42. Workflows https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow
43. Open source git workflow
44. lfreneda/projeto
45. lfreneda/projeto lfreneda/projeto clone
46. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto clone clone
47. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto rafao/projeto rafao/projeto clone clone
48. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto rafao/projeto rafao/projeto push push push pull pull pull
49. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto rafao/projeto rafao/projeto pull pull pull pull pull push push push
50. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto rafao/projeto rafao/projeto pull pull pull push push pull
51. lfreneda/projeto lfreneda/projeto marcelo/projeto marcelo/projeto rafao/projeto rafao/projeto pull pull push pull
52. Git non-basic commands Git init --bare Git blame <file> Git diff Git merge branch-name --no-ff Git rebase -i Git cherry-pick Git reflog Git add -i Git add -p Git remote prune origin Git stash Git fetch Git commit --amend
53. Git pull Git pull origin master { Git fetch origin Git merge origin/master Git pull --rebase origin master { Git fetch origin Git rebase origin/master
54. Git log git log --oneline git log --graph git log --all --color --graph --pretty=format:'%Cred%h%Creset -%C (yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' -- abbrev-commit
55. Pretty long command ? Alias to the rescue!
56. git config --global alias.lg "log --all --color --graph --pretty=format:'%Cred%h% Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>% Creset' --abbrev-commit" Alias to the rescue!
57. Commit messages best practice
61. Hands on Feedback
62. Feedback Will you endorse me?