Commandless Git

Having a basic understanding of how Git works is the key to taking the most out of it.

Transcript

1. Commandless Git https://www.flickr.com/photos/sfxeric/4578550858
2. Alex Tercete @alextercete Rio de Janeiro, Brazil EnergyHelpline
3. https://www.flickr.com/photos/cdevers/3292421477
4. https://www.flickr.com/photos/cdevers/4618787095
5. https://www.flickr.com/photos/cdevers/4618786545
6. Simplified Model
7. Engine Fuel Transmission Wheels Brakes Steering
8. Engine Fuel Transmission Wheels Brakes Steering
9. Engine Fuel Transmission Wheels Brakes Steering
10. Engine Fuel Transmission Wheels Brakes Steering
11. Brakes Engine Fuel Transmission Wheels Steering
12. Makes things intuitive
13. Brakes Engine Fuel Transmission Wheels Steering Brake
14. Brakes Engine Fuel Transmission Wheels Steering
15. Brakes Engine Fuel Transmission Wheels Steering
16. It works, but not as it was meant to
17. Brakes Engine Fuel Transmission Wheels Steering
18. Brakes Engine Fuel Transmission Wheels Steering
20. Working directory Staging area path/to/A.txt path/to/B.txt Files database Add
21. Working directory Staging area path/to/A.txt path/to/B.txt Files database
22. Working directory Staging area path/to/A.txt path/to/B.txt Files database Hash generation SHA1 c3
23. Working directory Staging area path/to/A.txt path/to/B.txt Files database Hash generation c3 SHA1
24. Working directory Staging area path/to/A.txt path/to/B.txt Files database c3
25. Working directory Staging area path/to/A.txt path/to/B.txt Files database c3
26. Working directory Staging area path/to/A.txt c3 path/to/A.txt path/to/B.txt Files database c3
27. Working directory Staging area path/to/A.txt c3 path/to/A.txt path/to/B.txt Files database c3 Hash generation SHA1 ed
28. Working directory Staging area path/to/A.txt c3 path/to/A.txt path/to/B.txt Files database c3 Hash generation SHA1 ed ed
29. c3 ed Files database Working directory Staging area path/to/A.txt c3 path/to/A.txt path/to/B.txt
30. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt c3 ed path/to/A.txt path/to/B.txt
31. – Hash is generated for the file’s content – Generated hash is the same for identical inputs – Files are saved to the files database – Changes are added to the staging area Add
32. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt c3 ed path/to/A.txt path/to/B.txt Commit
33. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt c3 ed path/to/A.txt path/to/B.txt
34. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt c3 ed path/to/A.txt path/to/B.txt Hash generation SHA1 ca c3 ed
35. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt c3 ed path/to/A.txt path/to/B.txt Hash generation SHA1 ca c3 ed path/to/A.txt path/to/B.txt c3 ed Commit ca
36. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt path/to/A.txt path/to/B.txt c3 ed Commit ca
37. c3 ed Files database Working directory Staging area Commit ca path/to/A.txt path/to/B.txt path/to/A.txt path/to/B.txt c3 ed Commits tree ca
38. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca
39. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt
40. c3 ed Files database Working directory Staging area path/to/A.txt Commits tree ca path/to/B.txt other/path/to/C.txt
41. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt path/to/B.txt other/path/to/C.txt 17 2b 17 2b
42. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt path/to/B.txt other/path/to/C.txt 17 2b 17 2b Hash generation SHA1 c3 17 7b 2b ca path/to/A.txt path/to/B.txt c3 17 Commit 7b other/path/to/C.txt 2b
43. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b path/to/A.txt path/to/B.txt c3 17 Commit 7b other/path/to/C.txt 2b 7b
44. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b
45. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b
46. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b other/path/to/C.txt 6d 6d
47. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b other/path/to/C.txt 6d 6d Hash generation SHA1 c3 17 6d path/to/A.txt path/to/B.txt c3 17 Commit 33 other/path/to/C.txt 6d 33 7b
48. c3 ed Files database Working directory Staging area path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33
49. – Hash is generated combining • Hash of the parent commit • Hashes of the files in the commit – Points to every file tracked by the repository – Staging area is cleared after the commit – Gets added to the commits tree Commit
50. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33 Branch
51. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33
52. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33
53. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33 feature/something 33
54. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33 feature/something 33
55. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33 feature/something 33 8e
56. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 33 master 33 feature/something 33 8e 4c
57. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 4c master 33 feature/something 4c 8e 4c
58. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 4c master 33 feature/something 4c 8e 4c
59. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 4c master 33 feature/something 4c 8e 4c ff
60. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 4c master 33 feature/something 4c 8e 4c ff 54
61. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54
62. – HEAD indicates the current commit being pointed to – There is nothing special about master – When on a branch, the reference gets updated after a commit Branch
63. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54 Checkout
64. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54
65. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD ca master 33 feature/something 54 8e 4c ff 54
66. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD ca master 33 feature/something 54 8e 4c ff 54
67. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca 17 2b 7b 6d 33 References HEAD ca master 33 feature/something 54 8e 4c ff 54
68. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54
69. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54
70. c3 ed Files database Working directory path/to/A.txt path/to/B.txt Commits tree ca other/path/to/C.txt 17 2b 7b 6d 33 References HEAD 54 master 33 feature/something 54 8e 4c ff 54
71. – Only HEAD moves – Files are copied from the files database into the working directory – Files database remains unaltered – Commits tree remains unaltered Checkout
72. Files database Commits tree ca 7b 33 References HEAD 54 master 33 feature/something 54 4c 54 c3 ed 17 2b 6d 8e ff Merge
73. Files database Commits tree ca 7b 33 References HEAD 54 master 33 feature/something 54 4c 54 c3 ed 17 2b 6d 8e ff
74. Files database Commits tree ca 7b 33 References HEAD 33 master 33 feature/something 54 4c 54 c3 ed 17 2b 6d 8e ff
75. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
76. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 Merge NO CONFLICTS
77. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
78. Files database Commits tree ca 7b 33 References HEAD 2f master 2f feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 2f
79. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 Merge WITH CONFLICTS
80. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
81. Files database Commits tree ca 7b 33 References HEAD b5 master b5 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 57 b5
82. – Brings changes from other branch into current branch – Conflict resolution is done once – Commit has two parents Merge
83. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 Rebase NO CONFLICTS
84. Files database Commits tree ca 7b 33 References HEAD e6 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
85. Files database Commits tree ca 7b 33 References HEAD 54 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
86. Files database Commits tree ca 7b 33 References HEAD a2 master e6 feature/something 54 a2 e6 c3 ed 17 2b 6d 8e ff 98 4c 54
87. Files database Commits tree ca 7b 33 References HEAD 9f master e6 feature/something 54 a2 e6 c3 ed 17 2b 6d 8e ff 98 4c 9f 54
88. Files database Commits tree ca 7b 33 References HEAD 9f master e6 feature/something 9f a2 e6 c3 ed 17 2b 6d 8e ff 98 4c 9f 54
89. Files database Commits tree ca 7b 33 References HEAD 54 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98 Rebase WITH CONFLICTS
90. Files database Commits tree ca 7b 33 References HEAD 54 master e6 feature/something 54 4c 54 e6 c3 ed 17 2b 6d 8e ff 98
91. Files database Commits tree ca 7b 33 References HEAD dd master e6 feature/something 54 dd e6 c3 ed 17 2b 6d 8e ff 98 4c 54 7f
92. Files database Commits tree ca 7b 33 References HEAD b8 master e6 feature/something 54 dd e6 c3 ed 17 2b 6d 8e ff 98 4c 54 7f b8
93. Files database Commits tree ca 7b 33 References HEAD b8 master e6 feature/something b8 dd e6 c3 ed 17 2b 6d 8e ff 98 4c 54 7f b8
94. – Puts changes introduced by current branch onto other branch – Conflict resolution is done for each commit – No extra commits are made Rebase
95. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Push
96. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin
97. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree
98. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33
99. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d
100. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33
101. – There is nothing special about origin – Tracking branch gets updated before uploading data to the remote – The remote is just another repository Push
102. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33 Fetch
103. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33
104. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33 62 b0 0e fa
105. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33 62 b0 0e fa 0e fa
106. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master 33 c3 ed 17 2b 6d ca 7b 33 62 b0 0e fa 0e fa 62 b0
107. Files database Commits tree ca 7b 33 References HEAD 33 master 33 c3 ed 17 2b 6d origin http://url Remotes Remote origin Files database Commits tree origin/master b0 c3 ed 17 2b 6d ca 7b 33 62 b0 0e fa 0e fa 62 b0
108. – Tracking branch gets updated after downloading data from the remote – Merge or rebase can be performed afterwards Fetch
109. https://www.flickr.com/photos/inthe-arena/15501000164
110. Reset Stash Revert
111. http://git-scm.com/book
112. Alex Tercete @alextercete speakerdeck.com/alextercete/commandless-git
113. Thank you! https://www.flickr.com/photos/sfxeric/4578550858