Upgrade to Pro — share decks privately, control downloads, hide ads and more …

WTF is GIT?

WTF is GIT?

My humble talk about GIT for MERA people

A8d8ca813a744866b9f85ea1cefb5813?s=128

Sergey Arkhipov

November 15, 2011
Tweet

Transcript

  1. WTF is GIT? a humble talk by Sergey Arkhipov in

    MERA on 15 Nov 2011 11 Jan 2013
  2. WTF is GIT? Agenda 1. What is GIT? 2. GIT

    vs ClearCase 3. Fully distributed 4. GIT workflow 5. Musthave commands 6. Some tools 7. Credits
  3. What is GIT?

  4. What is GIT? Git is an open source, distributed version

    control system designed for speed and efficiency.
  5. What is GIT? Came from Linux world 1991-2002 No source

    code management (tarballs and patches) 2002-2005 Bitkeeper 2005- Git
  6. What is GIT? Git is an open source, distributed version

    control system designed for speed and efficiency.
  7. Snapshots, not patches!

  8. What is GIT? Snapshots, not patches! Delta storage Snapshot storage

  9. What is GIT? Snapshots, not patches! Delta storage C1 spam.py

    eggs.py build.xml Snapshot storage
  10. What is GIT? Snapshots, not patches! Delta storage C1 C2

    spam.py eggs.py build.xml Δ 1 Δ 1 Snapshot storage
  11. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Snapshot storage
  12. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage
  13. What is GIT? Snapshots, not patches! Delta storage C1 spam.py

    eggs.py build.xml Snapshot storage C1 A B C
  14. What is GIT? Snapshots, not patches! Delta storage C1 C2

    spam.py eggs.py build.xml Δ 1 Δ 1 Snapshot storage C1 C2 A B C A1 C1 B1
  15. What is GIT? Snapshots, not patches! Delta storage C1 C2

    spam.py eggs.py build.xml Δ 1 Δ 1 Snapshot storage C1 C2 A B C A1 C1 B1
  16. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Snapshot storage C1 C2 C3 A B C A1 C1 A2 B2 B1 C2
  17. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Snapshot storage C1 C2 C3 A B C A1 C1 A2 B2 B1 C2
  18. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage C1 C2 C3 C4 A B C A1 C1 A2 B2 C3 B1 C2 A3 B3
  19. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage C1 C2 C3 C4 A B C A1 C1 A2 B2 C3 B1 C2 A3 B3
  20. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage C1 C2 C3 C4 A B C A1 C1 A2 B2 C3 B1 C2 A3 B3
  21. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage C1 C2 C3 C4 A B C A1 C1 A2 B2 C3 B1 C2 A3 B3
  22. What is GIT? Snapshots, not patches! Delta storage C1 C2

    C3 C4 spam.py eggs.py build.xml Δ 1 Δ 1 Δ 2 Δ 2 Δ 3 Snapshot storage C1 C2 C3 C4 A B C A1 C1 A2 B2 C3 B1 C2 A3 B3
  23. OK. But how is this different to our beloved ClearCase?

  24. GIT vs ClearCase

  25. GIT vs ClearCase

  26. GIT vs ClearCase

  27. GIT vs ClearCase

  28. GIT vs ClearCase

  29. GIT vs ClearCase

  30. GIT vs ClearCase

  31. GIT vs ClearCase

  32. Everything looks great, but…

  33. GIT vs ClearCase After 1 year…

  34. GIT vs ClearCase

  35. GIT vs ClearCase

  36. GIT vs ClearCase

  37. ?

  38. GIT vs ClearCase

  39. GIT vs ClearCase D1_XXYX_MERA D3_XAYX_MERA D4_XAYX_MERA D3_ZZZ_MERA D1_MAIN_MERA D1_LULZ_MERA D2_LULZ_MERA

    D3_LULZ_MERA D5_MAIN_MERA D1_WOOT_MERA
  40. GIT vs ClearCase D1_XXYX_MERA D3_XAYX_MERA D4_XAYX_MERA D3_ZZZ_MERA D1_MAIN_MERA D1_LULZ_MERA D2_LULZ_MERA

    D3_LULZ_MERA D5_MAIN_MERA D1_WOOT_MERA D16_SUPA_MERA D1_ARGH_MERA D1_FEAT_MERA D1_KILL_MERA D3_MAIN_MERA
  41. GIT vs ClearCase D1_XXYX_MERA D3_XAYX_MERA D4_XAYX_MERA D3_ZZZ_MERA D1_MAIN_MERA D1_LULZ_MERA D2_LULZ_MERA

    D3_LULZ_MERA D5_MAIN_MERA D1_WOOT_MERA D16_SUPA_MERA D1_ARGH_MERA D1_FEAT_MERA D1_KILL_MERA D3_MAIN_MERA D34_LOLD_MERA D8_EVERYTHING D1_15L5_MERA D8_PHHH_MERA D46_LBL1_MERA D4_1l1l_MERA NBC_SO_NBC SIMPLE_LABEL
  42. GIT vs ClearCase D1_XXYX_MERA D3_XAYX_MERA D4_XAYX_MERA D3_ZZZ_MERA D1_MAIN_MERA D1_LULZ_MERA D2_LULZ_MERA

    D3_LULZ_MERA D5_MAIN_MERA D1_WOOT_MERA D16_SUPA_MERA D1_ARGH_MERA D1_FEAT_MERA D1_KILL_MERA D3_MAIN_MERA D34_LOLD_MERA D8_EVERYTHING D1_15L5_MERA D8_PHHH_MERA D46_LBL1_MERA D4_1l1l_MERA NBC_SO_NBC SIMPLE_LABEL D46_XYZ_MERA D15_XYZ_MERA D18_XYZ_MERA D46_666_MERA TIRED_TO_COPYPASTE D46_HMM_MERA D46_XYZ_MERA D1_WRONG_MERA
  43. GIT vs ClearCase D1_XXYX_MERA D3_XAYX_MERA D4_XAYX_MERA D3_ZZZ_MERA D1_MAIN_MERA D1_LULZ_MERA D2_LULZ_MERA

    D3_LULZ_MERA D5_MAIN_MERA D1_WOOT_MERA D16_SUPA_MERA D1_ARGH_MERA D1_FEAT_MERA D1_KILL_MERA D3_MAIN_MERA D34_LOLD_MERA D8_EVERYTHING D1_15L5_MERA D8_PHHH_MERA D46_LBL1_MERA D4_1l1l_MERA NBC_SO_NBC SIMPLE_LABEL D1_GUYS_ARE_YOU_HAPPY_MERA
  44. Are you really happy?

  45. GIT vs ClearCase Ordinary ClearCase user

  46. GIT vs ClearCase Ordinary GIT user

  47. Have you ever realized what your ClearCase view really is?

  48. GIT vs ClearCase sum.c subtract.c multiply.c

  49. GIT vs ClearCase sum.c subtract.c multiply.c

  50. GIT vs ClearCase sum.c subtract.c multiply.c D1_YYY_MERA D2_XXXBLU_MERA D1_ZZZBLU_MERA

  51. GIT vs ClearCase sum.c subtract.c multiply.c D2_YYY_MERA D2_XXX_MERA D3_ZZZ_MERA

  52. GIT vs ClearCase sum.c subtract.c multiply.c D5_YYY_MERA D12_XXX_MERA D95_ZZZ_MERA

  53. Any ideas about evolution of your view?

  54. GIT vs ClearCase sum.c subtract.c multiply.c

  55. GIT vs ClearCase sum.c subtract.c multiply.c

  56. GIT vs ClearCase sum.c subtract.c multiply.c

  57. GIT vs ClearCase sum.c subtract.c multiply.c

  58. GIT vs ClearCase A3 A1 A2 B1 C2 C1 C3

    B2 B3 sum.c subtract.c multiply.c
  59. GIT vs ClearCase A1 B1 C1 A2 B2 C2 A3

    B3 C3
  60. GIT vs ClearCase A1 B1 C1 A2 B2 C2 A3

    B3 C3
  61. GIT vs ClearCase A1 B1 C1 A2 B2 C2 A3

    B3 C3 Snapshot 1 Snapshot 2 Snapshot 3
  62. GIT vs ClearCase A1 B1 C1 A2 B2 C2 A3

    B3 C3 Snapshot 1 Snapshot 2 Snapshot 3
  63. Do not lie yourself. You do not deal with labels.

    You deal with snapshots.
  64. GIT vs ClearCase • 'Baseline' means 'snapshot' in GIT terms.

    • But to deliver you correct snapshots there is the team of masterminds Tieto SWDI who supports label system and makes centralized system redundant. • Each config spec includes over 9000 different labels to create 1 snapshot.
  65. Over 9000 labels to create 1 snapshot

  66. GIT vs ClearCase • And if you want to extend

    your snapshot, you need to add much more additional rules prettifying Frankensteinish settings. • Each rule defines how your local copy of ClearCase will have to request information about certain file or diff by network. • Each operation is performed over the network which causes mortal delays. Everything is very slow. • Without network you cannot even open file or build something. • You need to explain your ClearCase by unreadable labels and awkward rules time after time which snapshot you need instead of straight using it.
  67. GIT vs ClearCase GIT have no such restrictions by design

    • GIT initialy operates snapshots, there is no need in any explicit determining which set of labels you need. • Everything is local. You may pull changes from master repository and continue your work even in aircraft, with branches and whole development story. You may check earliest version even you lost in Tundra without any internet signs. • Your repository is your own game. You can develop in any way you want. Just send your changes into central repository at time. • Operations are really rapid and easy. If you want to select LSV or branch, you do not need to ask central repository for proper set of rules. Just use it!
  68. Examples

  69. GIT vs ClearCase Choosing baseline ClearCase way Git way $

    git checkout BASELINE work $ select_config CPP_DESIGN wait for 2 minutes select latest baseline have a cup of tea exclude components push 'Set' button wait for 2 minutes close application wait for 1 minute work
  70. GIT vs ClearCase Branching ClearCase way Git way $ git

    checkout -b hardcore_branch work $ ct mkbrtype hardcore_branch $ ctedcs Type something like element * CHECKEDOUT element <path> …/hardcore_branch/LATEST element <path> /main/cppdev/LATEST -mkbranch hardcore_branch $ ct co -nc <path>/<file> Work if noone checkedout a file
  71. GIT vs ClearCase Building your software ClearCase GIT $ cat

    ./git_build.sh git checkout BASELINE cd <path to one our famed component> <build command> $ cat ./cc_build.sh ct_set_needed_cs -version <LSV> -baseline <BASELINE> cd <path to one our famed component> <build command>
  72. GIT vs ClearCase Building your software ClearCase GIT $ time

    -p ./git_build.sh > /dev/null real 58.28 user 21.20 sys 35.14 $ time -p ./cc_build.sh > /dev/null real 1053 user 266 sys 78.72
  73. GIT vs ClearCase Building your software ClearCase GIT $ time

    -p ./git_build.sh > /dev/null real 58.28 user 21.20 sys 35.14 $ time -p ./cc_build.sh > /dev/null real 1053 user 266 sys 78.72 17.5 minutes vs 1 minute!
  74. Do you really like ClearCase?

  75. Or you just have not used something completely different before?

  76. GIT vs ClearCase • GIT support your actual way of

    developing software by design. You do not need to juggle tons of labels being in a jail of ClearCase ancient restrictions. • ClearCase does not allow to use modern convenient ways of developing 'out of box'. It provides you with hardcore methods for hacking it only. • Everytime you need something from ClearCase, you need to modify your config spec which already contains text with size around a two volumes of 'War and Peace' book instead of telling it what you really want to get. You do not use ClearCase to simplify your job, everytime you appeal to it to get anything.
  77. Switcher vocabulary

  78. Switcher vocabulary • Repository — the copy of project •

    Commit — fixed snapshot of code base in repository • Checking out — about populating working tree with the content of a commit: • Fetch info from repository what files that should be checked out • Populating working tree with those files • There is no locking going on anywhere • git checkout file does not imply any locking • Checking in – in git you do two things instead: • Create commit of your change set, store in local repository (git commit) • Pushing from your local repository to remote repository (git push)
  79. Fully distrubuted

  80. What is GIT? Git is an open source, distributed version

    control system designed for speed and efficiency.
  81. Fully distributed (almost) everything is local which means ― everything

    is fast; ― every clone is backup; ― work offline; ― every known remote repo is branch;
  82. Fully distributed

  83. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories
  84. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories Designer Designer QA
  85. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master
  86. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master
  87. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master
  88. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x
  89. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y
  90. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y
  91. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y BUG!!!
  92. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y BUG!!! I take it.
  93. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y bug_y
  94. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y Ready! bug_y
  95. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y bug_y
  96. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y maintenence Ivan, I've done my part
  97. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x test_y maintenence
  98. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x maintenence Looks OK!
  99. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master feature_x feature_x maintenence test_z
  100. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x test_z BUG!!!
  101. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x test_z BUG!!! I take it.
  102. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x test_z bugfix_z
  103. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x test_z bugfix_z Ready
  104. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x test_z bugfix_z
  105. Fully distributed Network down Ivan's repository Nikolay's repository Natasha's repository

    master master master feature_x feature_x bugfix_z Looks OK! bugfix_z
  106. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master feature_x feature_x bugfix_z Integration repository Trunk repository Central network repositories master master maintenence
  107. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master feature_x feature_x Integration repository Trunk repository Central network repositories master master maintenence
  108. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master feature_x feature_x Integration repository Trunk repository Central network repositories master master maintenence Ready. Need to rebase.
  109. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master feature_x feature_x Integration repository Trunk repository Central network repositories master master maintenence
  110. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master feature_x feature_x Integration repository Trunk repository Central network repositories master master maintenence
  111. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master Integration repository Trunk repository Central network repositories master master maintenence New feature is ready! New feature is ready!
  112. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master Integration repository Trunk repository Central network repositories master master maintenence regressions
  113. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master Integration repository Trunk repository Central network repositories master master maintenence Old feature looks done regressions
  114. Fully distributed Ivan's repository Nikolay's repository Natasha's repository master master

    master Integration repository Trunk repository Central network repositories master master maintenence
  115. Fully distributed Ivan's repository Nikolay's repository Natasha's repository Integration repository

    Trunk repository Central network repositories master master master master master
  116. GIT workflow

  117. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  118. Branches

  119. GIT workflow Branching in details A1 master HEAD

  120. GIT workflow Branching in details A1 A2 master HEAD

  121. GIT workflow Branching in details A1 A2 A3 master HEAD

    git branch newbranch
  122. GIT workflow Branching in details A1 A2 A3 master HEAD

    newbranch
  123. GIT workflow Branching in details A1 A2 A3 master HEAD

    git checkout newbranch newbranch
  124. GIT workflow Branching in details A1 A2 A3 master HEAD

    newbranch
  125. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 newbranch
  126. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 A5 newbranch
  127. GIT workflow Branching in details A1 A2 A3 master A4

    A5 git checkout master HEAD newbranch
  128. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 A5 newbranch
  129. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 A5 newbranch
  130. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 A5 A6 newbranch
  131. GIT workflow Branching in details A1 A2 A3 master HEAD

    A4 A5 A6 A7 newbranch
  132. What's up, folks? This presentation contains 262 slides and looks

    like that you have reached the midway. Congrats!
  133. GIT workflow Branching in details • Branch pointer always points

    on the head of a branch; • Creating branch = creating pointer to commit. 41 bytes on your disk; • Removing branch is removing pointer. • Obsolete commits is removed by GIT's GC; • HEAD meta-tag points to a current active branch; • One task = one branch.
  134. GIT workflow Branching in details • Branch pointer always points

    on the head of a branch; • Creating branch = creating pointer to commit. 41 bytes on your disk; • Removing branch is removing pointer. • Obsolete commits is removed by GIT's GC; • HEAD meta-tag points to a current active branch; • One task = one branch.
  135. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  136. Staging and commiting

  137. GIT workflow Staging and commiting Working directory Index Repository

  138. GIT workflow Staging and commiting A working copy of your

    project Working directory Index Repository
  139. GIT workflow Staging and commiting Staging area Working directory Index

    Repository
  140. GIT workflow Staging and commiting Object database Working directory Index

    Repository
  141. GIT workflow Staging and commiting $ git status # On

    branch master # # Initial commit # nothing to commit (create/copy files and use "git add" to track)
  142. GIT workflow Staging and commiting $ git status # On

    branch master # # Initial commit # nothing to commit (create/copy files and use "git add" to track)
  143. GIT workflow Staging and commiting $ emacs helloworld.c $ cat

    helloworld.c /* This is a classic 'hello world' app */ int main (int argc, char** argv) { puts("Hello, brave new world!"); return 0; }
  144. GIT workflow Staging and commiting $ emacs helloworld.c $ cat

    helloworld.c /* This is a classic 'hello world' app */ int main (int argc, char** argv) { puts("Hello, brave new world!"); return 0; }
  145. GIT workflow Staging and commiting $ git status # On

    branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # helloworld.c nothing added to commit but untracked files present (use "git add" to track)
  146. GIT workflow Staging and commiting $ git status # On

    branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # helloworld.c nothing added to commit but untracked files present (use "git add" to track)
  147. GIT workflow Staging and commiting $ git add helloworld.c $

    git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: helloworld.c #
  148. GIT workflow Staging and commiting $ git add helloworld.c $

    git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: helloworld.c #
  149. GIT workflow Staging and commiting $ git commit -m "Useful

    comment" [master (root-commit) 23409d6] Useful comment 1 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 helloworld.c
  150. GIT workflow Staging and commiting $ emacs helloworld.c $ cat

    helloworld.c /* This is a classic 'hello world' app */ #include <stdio.h> int main (int argc, char** argv) { puts("Hello, brave new world!"); return 0; }
  151. GIT workflow Staging and commiting $ git status # On

    branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c # no changes added to commit (use "git add" and/or "git commit -a")
  152. GIT workflow Staging and commiting $ git status # On

    branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c # no changes added to commit (use "git add" and/or "git commit -a")
  153. GIT workflow Staging and commiting $ git status # On

    branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c # no changes added to commit (use "git add" and/or "git commit -a")
  154. GIT workflow Staging and commiting $ git diff --- a/helloworld.c

    +++ b/helloworld.c @@ -1,5 +1,7 @@ /* This is a classic 'hello world' app */ +#include <stdio.h> + int main (int argc, char** argv) { puts("Hello, brave new world!");
  155. GIT workflow Staging and commiting $ git diff --- a/helloworld.c

    +++ b/helloworld.c @@ -1,5 +1,7 @@ /* This is a classic 'hello world' app */ +#include <stdio.h> + int main (int argc, char** argv) { puts("Hello, brave new world!");
  156. GIT workflow Staging and commiting $ git add helloworld.c $

    git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c #
  157. GIT workflow Staging and commiting $ emacs helloworld.c $ cat

    helloworld.c /* This is a classic 'hello world' app */ #include <stdio.h> int main (int argc, char** argv) { printf("Hello, brave new world!\n"); return 0; }
  158. GIT workflow Staging and commiting $ git status # On

    branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  159. GIT workflow Staging and commiting $ git status # On

    branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  160. GIT workflow Staging and commiting $ git diff --- a/helloworld.c

    +++ b/helloworld.c @@ -4,6 +4,6 @@ int main (int argc, char** argv) { - puts("Hello, brave new world!"); + printf("Hello, brave new world!\n"); return 0; }
  161. GIT workflow Staging and commiting $ git diff --- a/helloworld.c

    +++ b/helloworld.c @@ -4,6 +4,6 @@ int main (int argc, char** argv) { - puts("Hello, brave new world!"); + printf("Hello, brave new world!\n"); return 0; }
  162. WTF?

  163. GIT workflow Staging and commiting Working directory Index Repository

  164. GIT workflow Staging and commiting Working directory Index Repository git

    add
  165. GIT workflow Staging and commiting Working directory Index Repository git

    add git commit
  166. GIT workflow Staging and commiting $ git status # On

    branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  167. GIT workflow Staging and commiting $ git status # On

    branch master # Changes that are staged: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes that are not staged: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  168. GIT workflow Staging and commiting Staged $ git status #

    On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  169. GIT workflow Staging and commiting Not staged $ git status

    # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: helloworld.c #
  170. GIT workflow Staging and commiting Please use git diff --cached

    to get expected output here.
  171. GIT workflow Staging and commiting You have to stage a

    file after you edit it
  172. GIT workflow Staging and commiting You have to stage a

    file after you edit it
  173. GIT workflow Staging and commiting You have to stage a

    file after you edit it
  174. GIT workflow Staging and commiting $ git commit -a Hello

    world of a new generation. # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: helloworld.c #
  175. GIT workflow Staging and commiting [master 4bbbef9] Hello world of

    a new generation. 1 files changed, 3 insertions(+), 1 deletions(-)
  176. GIT workflow Staging and commiting [master 4bbbef9] Hello world of

    a new generation. 1 files changed, 3 insertions(+), 1 deletions(-)
  177. GIT workflow Staging and commiting 4bbbef9

  178. GIT workflow Staging and commiting 4bbbef94bbbef9b703c8197ec34cb90382c7b8fd5046a9a

  179. GIT workflow Staging and commiting $ tree -a . ├──

    .git │ ├── branches │ ├── COMMIT_EDITMSG │ ├── config │ ├── description │ ├── HEAD │ ├── hooks │ │ ├── applypatch-msg.sample │ │ ├── ... │ ├── index │ ├── info │ │ └── exclude │ ├── logs │ │ ├── HEAD │ │ └── refs │ │ └── heads │ │ └── master │ ├── objects │ │ ├── 23 │ │ │ └── 409d6895e7cb65306d4ed7d0c558ced6c82753 │ │ ├── ... │ │ ├── info │ │ └── pack │ └── refs │ ├── heads │ │ └── master │ └── tags └── helloworld.c
  180. GIT workflow Staging and commiting 4bbbef94bbbef9b703c8197ec34cb90382c7b8fd5046a9a commit Size Tree Parent

    Author Commiter c4ec5 d8a16 Ivan Petr Hello world of a new generation.
  181. GIT workflow Staging and commiting 4bbbef94bbbef9b703c8197ec34cb90382c7b8fd5046a9a commit Size Tree Parent

    Author Commiter c4ec5 d8a16 Ivan Petr Hello world of a new generation. ./ c4ec5 helloworld.c c4ec5
  182. GIT workflow Staging and commiting 4bbbef94bbbef9b703c8197ec34cb90382c7b8fd5046a9a commit Size Tree Parent

    Author Commiter cfbb1 cae87 Ivan Petr Initial commit. commit Size Tree Parent Author Commiter c4ec5 d8a16 Ivan Petr Hello world of a new generation.
  183. GIT workflow Staging and commiting Repository c1e fa8 135 47b

    aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  184. GIT workflow Staging and commiting Repository git checkout 47b c1e

    fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  185. GIT workflow Staging and commiting Repository git checkout 47b c1e

    fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  186. GIT workflow Staging and commiting Repository git checkout 47b c1e

    fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  187. GIT workflow Staging and commiting Repository Index ./ helloworld.c farewell.c

    ccc cfe aba c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  188. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  189. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  190. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  191. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c git add c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  192. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  193. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c afa 13a c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  194. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c afa 13a git commit c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 813
  195. GIT workflow Staging and commiting Repository Index Working directory ./

    helloworld.c farewell.c ccc cfe aba ./ helloworld.c farewell.c afa 13a c1e fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 13a 813 afa ae7
  196. GIT workflow Staging and commiting Repository Index Working directory c1e

    fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 13a 813 afa ae7 ./ helloworld.c farewell.c 13a afa aba ./ helloworld.c farewell.c
  197. GIT workflow Staging and commiting Repository Index Working directory c1e

    fa8 135 47b aba a5b ccc cfe c0d 0aa 17f ffe 9b4 400 13a 813 afa ae7 ./ helloworld.c farewell.c 13a afa aba ./ helloworld.c farewell.c
  198. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  199. Rebasing

  200. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7
  201. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 git rebase master
  202. GIT workflow Rebasing A1 A2 A3 master HEAD branch A6

    A7 A8 A9
  203. Huh? Where is my A4 and A5? What is happening?

  204. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 git rebase master
  205. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A8 = A7 with A4 patch
  206. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A9 = A8 with A5 patch A9
  207. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A9
  208. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A9
  209. GIT workflow Rebasing A1 A2 A3 master HEAD branch A6

    A7 A8 A9
  210. GIT workflow Rebasing A1 A2 A3 master HEAD branch A6

    A7 A8 A9
  211. GIT workflow Rebasing Never rebase when you are on a

    shared branch
  212. GIT workflow Rebasing Never rebase when you are on a

    shared branch
  213. GIT workflow Rebasing Never rebase a shared branch

  214. GIT workflow Rebasing Never rebase a shared branch* * Or

    learn git reflog
  215. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7
  216. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 git checkout master
  217. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7
  218. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 git rebase branch
  219. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7
  220. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A8 = A5 with A6 patch
  221. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 A9 = A8 with A7 patch A9
  222. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8 Now A6 and A7 commits will be deleted. Forever. A9
  223. GIT workflow Rebasing A1 A2 A3 master HEAD branch A4

    A5 A8 You have broken common branch. If you push it somewhere, it will break other's ones. A9
  224. GIT workflow Rebasing Never rebase a shared branch, you idiot!

  225. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  226. Merges

  227. GIT workflow Merges A1 A2 A3 master HEAD branch A4

    A5 A6 A7
  228. GIT workflow Merges A1 A2 A3 master HEAD branch A4

    A5 A6 A7 git merge branch
  229. GIT workflow Merges A1 A2 A3 master HEAD branch A4

    A5 A6 A7 A8
  230. Have you really thought that GIT have complicated merges?

  231. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  232. Push and pull

  233. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD
  234. GIT workflow Push and pull git fetch

  235. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD git fetch remote
  236. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A5 A6 A7 A8 A9 A10 A10
  237. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A5 A6 A7 A8 A9 A10 A10
  238. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A5 A6 A7 A8 A9 A10 A10 remote/master remote/hotfix
  239. GIT workflow Push and pull git pull

  240. GIT workflow Push and pull pull = fetch + merge

  241. GIT workflow Push and pull git push

  242. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD
  243. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD git push remote feature
  244. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13
  245. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13
  246. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13 feature
  247. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13 feature git push remote master
  248. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13 feature To <url> ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '<url>' To prevent you from losing history, Non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push —help' for details.
  249. GIT workflow Push and pull Remote repository Local repository A1

    A2 A3 A4 A5 A6 A7 A8 A9 A10 A1 A2 A3 A4 A11 A13 master master hotfix feature HEAD A11 A13 feature To <url> ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '<url>' To prevent you from losing history, Non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push —help' for details.
  250. GIT workflow Push and pull git push is about fast-forward

    merges
  251. GIT workflow Push and pull Always pull before push!

  252. GIT workflow Push and pull Always pull before push!

  253. GIT workflow • Create your branch • Edit files •

    Stage your changes • Commit the changes • Rebase your branch from master • Merge to master • Push to central repository
  254. There are only 5 slides left. Cheer up!

  255. Must-have commands

  256. Must-have commands git diff git status git clone git merge

    git add git log git commit git push git branch git pull git blame git fetch 12 commands
  257. Some tools

  258. Some tools gitk

  259. Some tools tig

  260. Credits

  261. Credits • Git Community Book • ProGit • Help on

    GitHub • Linus Torvalds on GIT • StackOverflow GIT tag • GIT Magic • GIT Immersion • GITCasts • GIT Wizardry • GIT Manual • GIT official site • GIT Reference
  262. that's it!