Save 37% off PRO during our Black Friday Sale! »

30分(くらい)でわかるGit / 30min-git

30分(くらい)でわかるGit / 30min-git

社内でデザイナーやインフラエンジニア向けに行ったGit勉強会の資料です。

676954675cda206b7baae939a82a8ef4?s=128

Kenichi Takahashi

March 16, 2015
Tweet

Transcript

  1. GMO Pepabo, Inc. Kenichi TAKAHASHI 2015/03/16 30෼ͰΘ͔ΔGitษڧձ ෼ ͘Β͍ Ͱ

    Θ͔Δ(JU
  2. ࠓ೔࿩͢͜ͱ  ϒϥϯνɺλά  NFSHFͱSFCBTF  QVMMͱϦϞʔτϦϙδτϦ

  3. Q ʮϒϥϯνʯʮλάʯ ͱ͸ͳΜͰ͔͢

  4. A ίϛοτϋογϡ ͷผ໊

  5. ίϛοτϋογϡJTԿ

  6. ίϛοτͷΠϝʔδ 0c3da 9sbde kecak 3dp00 cdnag vvynm 3dmbb venat

  7. ҰͭલͷίϛοτΛ஌ͬͯΔ 0c3da 9sbde kecak 3dp00 cdnag vvynm 3dmbb venat

  8. ϒϥϯνͷΠϝʔδ master branch_1 branch_2

  9. λάͷΠϝʔδ master branch_1 branch_2 v0.9 v0.8

  10. HJUMPHEFDPSBUF

  11. Q ʮ)&"%ʯ ͱ͸ͳΜͰ͔͢

  12. A ࠓ͍Δίϛοτϋογϡ ͷผ໊

  13. )&"%ͷΠϝʔδ master branch_1 branch_2 v0.9 v0.8 HEAD

  14. HJUDIFDLPVUCSBODI@ master branch_1 branch_2 v0.9 v0.8 HEAD

  15. HJUDIFDLPVUW master branch_1 branch_2 v0.9 v0.8 HEAD

  16. ϒϥϯνɺλάɺίϛοτ  ϒϥϯνͱλά͸ίϛοτϋογϡ ͷผ໊  HJUDIFDLPVU͸ࢦఆͨ͠ίϛοτ ͷঢ়ଶʹҠಈ͢Δ  )&"%͸ࠓ͍Δίϛοτϋογϡͷ ผ໊

  17. ߟ͑ͯΈΑ͏  ϒϥϯνΛ੾Δͱ͸Ͳ͏͍͏͜ͱ͔  λάΛଧͭͱ͸Ͳ͏͍͏͜ͱ͔  ϒϥϯνͱλά͸Կ͕ҧ͏ͷ͔  DIFDLPVUͱSFTFUͷҧ͍͸Կ͔

  18. Q NFSHFͱSFCBTF Λઆ໌͍ͯͩ͘͠͞

  19. A NFSHF͸ͭͷ਌Λ࣋ ͭίϛοτΛ࡞Δ͜ͱ

  20. A SFCBTF͸ϒϥϯνͷ ผΕ໨Λܧ͗׵͑Δ ˞ਖ਼֬ੑʹ͚ܽΔදݱͰ͕͢ɺΘ͔Γ΍͍͔͢΋

  21. NFSHFͱ͸ master branch_1 branch_2 HEAD

  22. HJUNFSHFCSBODI@ master branch_1 branch_2 HEAD

  23. HJUNFSHFCSBODI@ branch_1 branch_2 master HEAD

  24. ίϯϑϦΫτͨ͠Β master branch_1 branch_2 HEAD ͜͜Ͱா৲ ͋Θͤ͢Δ

  25. HJUNFSHF  ਌Λೋͭ΋ͭίϛοτΛ࡞Δ͜ͱ  ίϯϑϦΫτͨ͠ͱ͖ʹ͸ɺ࠷ऴత ʹͲ͏͍͔ͨ͠Λߟ͑ͯɺϚʔδί ϛοτͷதͰ௚͢

  26. SFCBTFͱ͸ master branch_1 branch_2 HEAD ˞)&"%͕CSBODI@ʹͳ͍ͬͯ·͢

  27. HJUSFCBTFNBTUFS master branch_2 branch_1 HEAD

  28. ίϛοτϋογϡΛݟͯΈΑ͏ master branch_2 branch_1 HEAD 0c3da 9sbde kecak 3dp00 vvynm

    3dmbb venat cemat 19ng8
  29. ίϛοτϋογϡ͕ҧ͏  ಉ͡ίϛοτͰ͸ͳ͍  ίϛοτ͸ҰͭલͷίϛοτΛ஌͍ͬͯΔ  ࠜຊ͕มΘΔͷͰҰͭલͷίϛοτ͕มΘΔ  ࠩ෼͚ͩΛऔΓͩͯ͠΍Γͳ͓͢Πϝʔδ 0c3da

    9sbde kecak 3dp00 vvynm 3dmbb cemat 19ng8
  30. ίϯϑϦΫτͨ͠Β master branch_2 HEAD branch_1 HEAD ͜ΕΛ࡞Ζ͏ͱͯ͠ ίϯϑϦΫτ

  31. ίϯϑϦΫτͷΠϝʔδ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU ͋ΔϑΝΠϧͷ಺༰͕͜ͷΑ͏ʹมߋ͞Ε͍ͯΔ

  32. ࠩ෼৘ใʹண໨ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU lighty を kitak に

    kitak を antipop に HJUEJGGΛΠϝʔδͯ͠
  33. ίϯϑϦΫτͷΠϝʔδ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU LJUBL BOUJQPQ લ͕ MJHIUZ

    ͡Όͳ͍ lighty を kitak に
  34. ίϯϑϦΫτͷղফ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU LJUBL BOUJQPQ hsbt を

    kitak に kitak を antipop に
  35. HJUSFCBTF  ϒϥϯνΛࠜຊ͔Βܧ͗׵͑Δ  ࠩ෼৘ใΛऔΓग़ͯ͠ɺίϛοτΛ ࡞Γ௚͍ͯ͘͠  ίϯϑϦΫτͨ͠ͱ͖͸ɺͲͷࠩ෼ Λ͍͋ͯͯΔͷ͔ɺͦͷ݁ՌͲ͏ͳͬ ͯ΄͍͔͠Λߟ͑Δ

  36. ௐ΂ͯΈΑ͏  SFCBTFͱDIFSSZQJDL  SFCBTFPOUP  SFCBTFJ

  37. Q HJUQVMMͬͯ Կ͕͓͖͍ͯΔͷ

  38. A HJUGFUDI HJUNFSHF

  39. Q HJUQVMMSFCBTFͬͯ Կ͕͓͖͍ͯΔͷ

  40. A HJUGFUDI HJUSFCBTF

  41. ϩʔΧϧͱϦϞʔτ master origin/master master HJUIVCDPN MPDBM

  42. ྆ํͰNBTUFSʹมߋ͕͋Δ master HJUIVCDPN MPDBM master origin/master

  43. ίϛοτϋογϡΛݟͯΈΔ master HJUIVCDPN MPDBM master origin/master 8neae h3nal

  44. HJUQVMM GFUDI master HJUIVCDPN MPDBM master origin/master 8neae h3nal 8neae

  45. HJUQVMM NFSHF master HJUIVCDPN MPDBM master origin/master 8neae h3nal 8neae

  46. HJUQVMMSFCBTF GFUDI master HJUIVCDPN MPDBM master origin/master 8neae h3nal 8neae

  47. HJUQVMMSFCBTF SFCBTF master HJUIVCDPN MPDBM master origin/master 8neae h3nal 8neae

    loen3
  48. HJUQVMM  HJUQVMMGFUDI NFSHF  ϦϞʔτϦϙδτϦ͔Βखݩʹͳ͍ ίϛοτΛऔಘ͢Δͷ͕GFUDI  GFUDI͔ͯ͠ΒͦΕΛϩʔΧϧϒϥ ϯνʹ൓ө͢Δํ๏ΛɺNFSHF͔

    SFCBTF͔Ͱબ୒Ͱ͖Δ
  49. ߟ͑ͯΈΑ͏  HJUQVTI͸ԿΛ͍ͯ͠Δͷ͔  ϒϥϯνΛSFCBTF͢ΔͱQVTIG ͕ඞཁʹͳΔཧ༝͸ͳ͔ͥ

  50. ࠓ೔࿩ͨ͜͠ͱ  ϒϥϯνɺλά  NFSHFͱSFCBTF  QVMMͱϦϞʔτϦϙδτϦ

  51. શͯΛίϛοτத৺ Ͱߟ͑Α͏

  52. ࠔͬͨΒ1SP(JU IUUQQSPHJUKBHJUIVCJP