Git For Humans - Holiday Extras - 14/08/2015

An internal talk introducing git terminology and workflow

Transcript

1. git for humans
2. What is git
3. 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. http://git-scm.com/
4. 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. http://git-scm.com/
5. Version Control System (VCS)
6. Source Control Management (SCM)
7. collection of files
8. every change tracked
9. who
10. when
11. why
12. Mostly used for code
13. Why do we use it
14. simultaneous working
15. easy to rollback
16. multiple backups multiple locations
17. Terminology
18. Setting Up
19. Repo (Repository)
20. files & history
22. $ git init
23. Remote
25. $ git remote
26. origin sandbox production
27. origin sandbox production
28. Clone
31. $ git clone {url}
34. $ git remote add {alias} {url}
35. 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.
36. Centralised
37. Distributed
38. Starting Your Work
39. Branch
40. $ git checkout {branch}
41. $ git checkout -b {branch}
42. master
43. master cool-thing
44. $ git checkout -b cool-thing
45. master cool-thing
46. master cool-thing
47. $ git checkout -
48. $ git fetch
49. Submitting Changes
50. Diff
51. $ git diff
52. - I removed this + and added this
53. $ git add -p
54. Stage
55. $ git add {file}
56. $ git status
57. $ git add .
58. Commit
59. $ git commit -m “{message}”
60. Push
61. $ git push {remote} {branch}
62. $ git push {remote} {branch}:{remote- branch}
63. Do some codings Stage changes Commit changes Push to remote In History Not In History
64. Staying Up-to-date
65. Pull
66. $ git pull {remote} {branch}
67. Merge
68. master cool-thing
69. master cool-thing
70. $ git merge {branch}
71. Rebase
72. master cool-thing
73. master cool-thing
74. $ git rebase {branch}
75. Conflicts
76. <<<<<<< HEAD my code ======= someone else’s code >>>>>>> master
77. Merge/Rebase Resolve Conflicts Stage Commit
78. Rolling Back
79. Before Staging
80. $ git checkout {file}
81. $ git checkout .
82. Once Staged
83. Reset
84. $ git reset
85. $ git reset --hard
86. Once Committed
87. Revert
88. $ git revert {commit}
89. $ git log
90. commit abcdefghijklmnop Author: joeblogg <joe.bloggs@website.com> Date: Fri Aug 7 13:19:34 2015 +0100 My super awesome change
91. commit abcdefghijklmnop Author: joeblogg <joe.bloggs@website.com> Date: Fri Aug 7 13:19:34 2015 +0100 My super awesome change
92. Questions?