git square
DESCRIPTION
Pequeña introducción a Git, presentada en el Grupo de Usuarios de Tecnologías Google en Madrid el 21de octubre del 2011.TRANSCRIPT
![Page 1: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/1.jpg)
Git^2Gentle Introduction To Git
1viernes 21 de octubre de 11
![Page 2: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/2.jpg)
It’s a Me!
• Sergio Arbeo
• Mathematician
• Programmer
2viernes 21 de octubre de 11
![Page 3: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/3.jpg)
History
• Based on BitKeeper (not OSS)
• Collections of scripts
3viernes 21 de octubre de 11
![Page 4: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/4.jpg)
Install Git
• Linux: from source or package.
• Mac: from package or brew.
• Windows: use an installer.
4viernes 21 de octubre de 11
![Page 5: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/5.jpg)
Setting it up
• system
• global
• specific
5viernes 21 de octubre de 11
![Page 6: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/6.jpg)
Setting it up
• git config --global user.name “River Song”
• git config --global user.email [email protected]
6viernes 21 de octubre de 11
![Page 7: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/7.jpg)
New repo
7viernes 21 de octubre de 11
![Page 8: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/8.jpg)
New Repo
8viernes 21 de octubre de 11
![Page 9: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/9.jpg)
New Repo
9viernes 21 de octubre de 11
![Page 10: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/10.jpg)
Next step. New file.
10viernes 21 de octubre de 11
![Page 11: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/11.jpg)
Next step. New file.
11viernes 21 de octubre de 11
![Page 12: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/12.jpg)
Git status
12viernes 21 de octubre de 11
![Page 13: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/13.jpg)
Next step. New file.
13viernes 21 de octubre de 11
![Page 14: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/14.jpg)
Track file.
14viernes 21 de octubre de 11
![Page 15: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/15.jpg)
Track file.
15viernes 21 de octubre de 11
![Page 16: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/16.jpg)
Track file.
16viernes 21 de octubre de 11
![Page 17: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/17.jpg)
Track file.
17viernes 21 de octubre de 11
![Page 18: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/18.jpg)
Echo, echo, echo...
18viernes 21 de octubre de 11
![Page 19: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/19.jpg)
Echo, echo, echo...
19viernes 21 de octubre de 11
![Page 20: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/20.jpg)
Echo, echo, echo...
20viernes 21 de octubre de 11
![Page 21: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/21.jpg)
Echo, echo, echo...
21viernes 21 de octubre de 11
![Page 22: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/22.jpg)
Echo, echo, echo...
22viernes 21 de octubre de 11
![Page 23: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/23.jpg)
Echo, echo, echo...
23viernes 21 de octubre de 11
![Page 24: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/24.jpg)
Echo, echo, echo...
24viernes 21 de octubre de 11
![Page 25: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/25.jpg)
WHAT
25viernes 21 de octubre de 11
![Page 26: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/26.jpg)
WHATTHE
26viernes 21 de octubre de 11
![Page 27: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/27.jpg)
WHATTHE
FUCK?
27viernes 21 de octubre de 11
![Page 28: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/28.jpg)
What’s out there?
• Working copy
• Stage
• Commited
28viernes 21 de octubre de 11
![Page 29: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/29.jpg)
Working copy
• Changes
• Not saved
29viernes 21 de octubre de 11
![Page 30: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/30.jpg)
Stage
• Saved changes
• Not committed
• Not in history yet
30viernes 21 de octubre de 11
![Page 31: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/31.jpg)
Stage: git add
• No file.
• But content.
31viernes 21 de octubre de 11
![Page 32: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/32.jpg)
Stage: git add
32viernes 21 de octubre de 11
![Page 33: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/33.jpg)
Committed
• Changes saved
• Committed
• In (local) history
33viernes 21 de octubre de 11
![Page 34: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/34.jpg)
git commit
• Saves the stage area
• Adds a message
34viernes 21 de octubre de 11
![Page 35: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/35.jpg)
git commit
35viernes 21 de octubre de 11
![Page 36: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/36.jpg)
git commit
36viernes 21 de octubre de 11
![Page 37: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/37.jpg)
git commit
37viernes 21 de octubre de 11
![Page 38: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/38.jpg)
git commit
38viernes 21 de octubre de 11
![Page 39: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/39.jpg)
git commit
39viernes 21 de octubre de 11
![Page 40: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/40.jpg)
Commit
40viernes 21 de octubre de 11
![Page 41: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/41.jpg)
Commit
41viernes 21 de octubre de 11
![Page 42: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/42.jpg)
Commit
42viernes 21 de octubre de 11
![Page 43: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/43.jpg)
Commit
43viernes 21 de octubre de 11
![Page 44: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/44.jpg)
Commit
44viernes 21 de octubre de 11
![Page 45: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/45.jpg)
Rewriting history
• Some nice commit message
• A nice commit message
45viernes 21 de octubre de 11
![Page 46: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/46.jpg)
git commit --amend
• You can
• You should not
• Seriously, forget it
46viernes 21 de octubre de 11
![Page 47: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/47.jpg)
git commit --amend
47viernes 21 de octubre de 11
![Page 48: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/48.jpg)
git commit --amend
48viernes 21 de octubre de 11
![Page 49: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/49.jpg)
git log
49viernes 21 de octubre de 11
![Page 50: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/50.jpg)
git log
• -n
• --since=”two days ago”
• --pretty=<format>
50viernes 21 de octubre de 11
![Page 51: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/51.jpg)
Hey, dawg!
51viernes 21 de octubre de 11
![Page 52: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/52.jpg)
What about that distributed thing?
52viernes 21 de octubre de 11
![Page 53: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/53.jpg)
Until now
• Local
• Local
• Local
53viernes 21 de octubre de 11
![Page 54: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/54.jpg)
!local
54viernes 21 de octubre de 11
![Page 55: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/55.jpg)
local
Remote
55viernes 21 de octubre de 11
![Page 56: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/56.jpg)
git remote
56viernes 21 de octubre de 11
![Page 57: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/57.jpg)
git remote
57viernes 21 de octubre de 11
![Page 58: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/58.jpg)
git remote
58viernes 21 de octubre de 11
![Page 59: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/59.jpg)
git remote
59viernes 21 de octubre de 11
![Page 60: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/60.jpg)
git remote
60viernes 21 de octubre de 11
![Page 61: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/61.jpg)
git remote
git fetch remotelocal
61viernes 21 de octubre de 11
![Page 62: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/62.jpg)
git remote
git pull remoteworkingcopy
62viernes 21 de octubre de 11
![Page 63: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/63.jpg)
git remote
git push remotelocal
63viernes 21 de octubre de 11
![Page 64: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/64.jpg)
git remote
git clone remote
64viernes 21 de octubre de 11
![Page 65: Git Square](https://reader031.vdocument.in/reader031/viewer/2022013003/547aff49b4af9f57738b4677/html5/thumbnails/65.jpg)
More, much more
• bisect
• revert
• cherry-pick
• stash (sorry, Fer)
• branches
65viernes 21 de octubre de 11