Upgrade to Pro — share decks privately, control downloads, hide ads and more …
Sign up for free

CPOSC2012 final.pdf

Avatar for Jason May Jason May
October 27, 2012
25
0

CPOSC2012 final.pdf

Avatar for Jason May

Jason May

October 27, 2012

Featured

See All Featured
Designing for humans not robots
Avatar for Tammie Lister tammielis
254
26k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
Avatar for Irina Nazarova irinanazarova
9
1.6k
Dominate Local Search Results - an insider guide to GBP, reviews, and Local SEO
Avatar for Greg Gifford greggifford
PRO
0
370
From π to Pie charts
Avatar for Rasagy Sharma rasagy
1
400
Fireside Chat
Avatar for paigeccino paigeccino
43
4.1k
We Are The Robots
Avatar for Honza Javorek honzajavorek
0
400
Leo the Paperboy
Avatar for Maya Tellez mayatellez
10
2.4k
Into the Great Unknown - MozCon
Avatar for Noah Learner thekraken
41
2.8k
Optimizing for Happiness
Avatar for Tom Preston-Werner mojombo
378
71k
The untapped power of vector embeddings
Avatar for Frank van Dijk frankvandijk
2
1.9k
Improving Core Web Vitals using Speculation Rules API
Avatar for Sergey Chernyshev sergeychernyshev
21
1.7k
What's in a price? How to price your products and services
Avatar for Michael Herold michaelherold
247
13k

Transcript

  1. Why We Love Git Jason May

  2. Why We Love Git We can expressively track content among

    multiple endpoints.

  3. Why We Love Git We can expressively track content among

    multiple endpoints.

  4. Why We Love Git We can expressively track content among

    multiple endpoints.

  5. Why We Love Git We can expressively track content among

    multiple endpoints.

  6. Why We Love Git We can expressively track content among

    multiple endpoints.

  7. Why We Love Git We can expressively track content among

    multiple endpoints.

  8. Commits are a form of documentation.

  9. Checkout states “HEAD”

  10. Checkout states Commit A Commit B HEAD

  11. Checkout states “HEAD” The working tree

  12. Checkout states $ touch README.txt

  13. Checkout states $ touch README.txt $ git status --short ??

    README.txt

  14. Checkout states Commit A Commit B HEAD Working tree

  15. Checkout states Working tree HEAD

  16. Checkout states Working tree HEAD ? ? ?

  17. Checkout states $ git add README.txt

  18. Checkout states $ git add README.txt $ git status --short

    A README.txt

  19. Checkout states The Index!

  20. Checkout states Commit A Commit B HEAD Working tree

  21. Checkout states Commit A Commit B HEAD

  22. Checkout states Commit A Commit B HEAD

  23. Checkout states Commit A Commit B HEAD Index

  24. Checkout states Working tree HEAD ? ? ?

  25. Checkout states Working tree HEAD Index

  26. Checkout states Working tree HEAD Index ? ? ?

  27. Checkout states $ git commit -m ‘Add README.txt’

  28. Checkout states $ git commit

  29. Checkout states Commit A Commit B HEAD Index README.txt

  30. Checkout states Commit A Commit B Index *commit* HEAD

  31. Checkout states Commit A Commit B Index HEAD

  32. Checkout states Commit A Commit B Index Commit C HEAD

  33. Checkout states Commit A Commit B Index Commit C HEAD

  34. Checkout states Commit A Commit B Commit C HEAD

  35. The concept of a ref

  36. Checkout states Commit A Commit B Commit C HEAD

  37. Checkout states 42ae0e0 8e0c855 bc65d74 f96bb37

  38. Checkout states 42ae0e0 8e0c855 bc65d74 f96bb37 HEAD

  39. HEAD What is a ref?

  40. my-branch What is a ref?

  41. origin/my-branch What is a ref?

  42. What is a ref? $ git reset HEAD^

  43. What is a ref? 42ae0e0 8e0c855 bc65d74 f96bb37 HEAD (reset)

  44. What is a ref? 42ae0e0 8e0c855 bc65d74 f96bb37 HEAD (reset)

  45. Remotes

  46. Interacting with a Remote

  47. Interacting with a Remote

  48. Interacting with a Cloning Remote

  49. Interacting with a Local Checkout Cloning Remote

  50. Interacting with a $ git clone git://HOST/repo.git

  51. Interacting with a $ git clone ./dir/repo.git

  52. Interacting with a $ git clone user@host:dir/repo.git

  53. Interacting with a Pulling Local Checkout Remote

  54. Interacting with a Pulling Local Checkout Remote

  55. Interacting with a $ git pull origin master

  56. git-fetch

  57. git-fetch git-merge

  58. master is local! origin/master is also local!

  59. Interacting with a $ git pull --rebase origin master

  60. git-fetch git-rebase

  61. Checkout states 42ae0e0 8e0c855

  62. Checkout states 42ae0e0 8e0c855 “base”

  63. Checkout states 42ae0e0 8e0c855

  64. Checkout states 42ae0e0 8e0c855 f96bb37

  65. Checkout states 42ae0e0 8e0c855 f96bb37

  66. Checkout states 42ae0e0 8e0c855 bc65d74 f96bb37

  67. Checkout states 42ae0e0 8e0c855 bc65d74 f96bb37 new “base”

  68. Checkout states 42ae0e0 8e0c855 bc65d74 f96bb37

  69. Interacting with a $ git push origin master

  70. Decentralization is great, but it is still good to create

    a structure of authority. Workflow

  71. Workflow gitolite

  72. Workflow

  73. git-flow

  74. git-flow features

  75. git-flow $ git flow feature start more-dots

  76. F E D A B C develop feature/more-dots

  77. git-flow releases

  78. git-flow $ git flow release start 2.0

  79. F E D A develop release/2.0 B C

  80. git-flow hotfixes

  81. git-flow $ git flow hotfix start 2.0.1

  82. F E D A develop hotfix/2.0.1 B C F E

    D A master

  83. git-flow support

  84. git-flow $ git flow support start 3.0

  85. git’s philosophy

  86. Immutable branches

  87. Rewriting history

  88. Is history ever lost?

  89. The ref log

  90. Example: git commit -- amend

  91. Git amend 42ae0e0 8e0c855 bc65d74 f96bb37

  92. Git amend 42ae0e0 8e0c855 bc65d74 f96bb37 fd0g830

  93. Git amend 42ae0e0 8e0c855 bc65d74 f96bb37 fd0g830 shows up in

    ref- log

  94. Git amend 42ae0e0 8e0c855 bc65d74 f96bb37 fd0g830 shows up in

    ref- log new HEAD

  95. When is this okay? Hasn’t been pushed upstream Pushed upstream

    but nobody has pulled*

  96. Summary Git history is very readable Constructing commits is flexible

    Organizing commits is flexible Virtually nothing is lost