知っておいてほしいGitの本当の基礎 / Let's know Git

by Masaya Kazama

Slide 1

Slide 1 text

஌͓͍ͬͯͯ΄͍͠ (JUͷຊ౰ͷجૅ

Slide 2

Slide 2 text

ίϛοτͷ࿈ͳΓͱHJUͷத਎ ʹ͍ͭͯ ˏNJZBPLB

Slide 3

Slide 3 text

தڃऀʙॳ৺ऀ޲͚

Slide 4

Slide 4 text

ͱɺࢥ͍͍ͨ

Slide 5

Slide 5 text

ૢ࡞ͷઆ໌ͱ͔ ͦ͏͍͏͜ͱΑΓ΋

Slide 6

Slide 6 text

ࠜຊతʹ(JUͷ࡞ΓΛ ஌Γ·͠ΐ͏

Slide 7

Slide 7 text

(JUͷίϛοτάϥϑ

Slide 8

Slide 8 text

FHGBDFCPPLSFBDU

Slide 9

Slide 9 text

͍͍ͬͨͲ͏΍ͬͯ ද͍ࣔͯ͠ΔͷͰ͠ΐ͏͔ʁ

Slide 10

Slide 10 text

ίϛοτͱ͸ JECCG BVUIPSOBNF EBUF "EEJOEFYQBHF JOEFYIUNM JNBHFQOH NBJOKT

Slide 11

Slide 11 text

ίϛοτͱ͸ JECCG BVUIPSOBNF EBUF "EEJOEFYQBHF JOEFYIUNM JNBHFQOH NBJOKT ͦΕͧΕϢχʔΫͳ*%Λ࣋ͪɺ ࡞੒ऀ΍೔෇৘ใɺ ίϛοτϝοηʔδΛ࣋ͪɺ ϑΝΠϧ಺༰Λ࣋ͪ·͢

Slide 12

Slide 12 text

ίϛοτͱ͸ ͦͯ͠ ਌ͷίϛοτ*%Λ࣋ͪ·͢ JECCG QBSFOUTEFDD BVUIPSOBNF EBUF "EEJOEFYQBHF JOEFYIUNM JNBHFQOH NBJOKT

Slide 13

Slide 13 text

༨ஊɿ(JUͰ࢖ΘΕΔ*% w 4)"ؔ਺ʢ੬ऑੑʣʹΑΔϢχʔΫͳ*% w ಉ͡಺༰ͳΒಉ͡*%ʹͳΔ w ϑϧͰจࣈͷਐ਺ʹͳΔ͕ɺઌ಄਺จࣈ෼͋ Ε͹ࣝผͰ͖ΔͷͰେ఍จࣈఔ౓ʹলུͰ͖Δ

Slide 14

Slide 14 text

w ਌ίϛοτΛḷ͍ͬͯ͘͜ͱͰπϦʔʹͳΓ·͢ ίϛοτͷ࿈ͳΓ JECCG QBSFOUTEFDD JEEFDD QBSFOUTGCD JEGCD QBSFOUTDFGF JEDFGF QBSFOUTBCG JEBCG QBSFOUTGEB

Slide 15

Slide 15 text

ίϛοτͷ࿈ͳΓ ࠷ॳͷίϛοτ

Slide 16

Slide 16 text

Ͱ΋ɺͲ͔͜ΒḷΔʁ

Slide 17

Slide 17 text

ίϛοτͷ࿈ͳΓ ࠷ॳͷίϛοτ w ֤ίϛοτ͸਌ํ޲ʹḷ͍ͬͯ͘ͷͰɺ࠷ॳͷίϛο τ͸ى఺ʹͳΒͳ͍

Slide 18

Slide 18 text

πϦʔͷى఺ NBTUFS EFWFMPQ W )&"%

Slide 19

Slide 19 text

ى఺ͱͳΔ΋ͷ )&"% ϒϥϯν λά

Slide 20

Slide 20 text

)&"%͔ΒḷΔ NBTUFS EFWFMPQ W )&"%

Slide 21

Slide 21 text

)&"%ͱ͸ w ݱࡏϦϙδτϦͷͲ͜ͷίϛοτΛࢦ͍ͯ͠Δͷ͔ͱ͍ ͏ϙΠϯλ w جຊతʹ͸બ୒தͷϒϥϯνΛࢦ͢ʢϒϥϯνͰ͸ͳ͘ ௚઀ίϛοτ*%Λࢦఆ͢Δ͜ͱ΋Ͱ͖Δ͕ܯࠂ͕ग़Δʣ w ͜ͷϙΠϯλͷࢦࣔ͢͠ίϛοτͱϫʔΫϑΝΠϧͱͷ ࠩ෼͕දࣔ͞ΕΔ

Slide 22

Slide 22 text

ϒϥϯνͷ੾Γସ͑ NBTUFS EFWFMPQ W )&"% HJUDIFDLPVUNBTUFS

Slide 23

Slide 23 text

)&"%ˠϒϥϯνˠίϛοτ w ʮ)&"%ˠ͍ͣΕ͔ͷϒϥϯνˠίϛοτʯͱࢀর͢Δ ͜ͱͰઌ಄ͷίϛοτ͕ܾ·ΓɺίϛοτπϦʔΛḷΔ ͜ͱ͕Ͱ͖Δ w ϒϥϯν΍λά͸ίϛοτΛࢦࣔ͢͠ᐼͷΑ͏ͳ΋ͷʢϒ ϥϯν͸Ҡಈ͢Δ͕λά͸ݻఆʣ w ϒϥϯνΛ੾Γସ͑Δͱ͍͏ͷ͸ɺ)&"%͕ࢀর͢Δϒ ϥϯνΛม͑Δͱ͍͏͜ͱ

Slide 24

Slide 24 text

Ͳ͔͜Β΋ࢀর͞Εͳ͍ίϛοτ NBTUFS EFWFMPQ W )&"%

Slide 25

Slide 25 text

Ͳ͔͜Β΋ࢀর͞Εͳ͍ίϛοτ w )&"%ͳͲ͔ΒḷΕͳ͍ίϛοτ͸πϦʔʹද ࣔ͞Εͳ͍ w ͭ·ΓπϦʔʹදࣔ͞Ε͍ͯΔ΋ͷ͕શͯͷί ϛοτͰ͸ͳ͍ w Ͳ͔͜Β΋ḷΕͳ͍ίϛοτ͸ͦͷ͏ͪࣗಈత ʹফڈ͞ΕΔ

Slide 26

Slide 26 text

ࢀর͞Εͳ͘ͳΔίϛοτྫ $ # " "EEJOFEYpMF )&"%

Slide 27

Slide 27 text

ίϛοτϝοηʔδͷUZQP "EEJOFEYpMF ·͕ͪ͑ͨʂ $ # " )&"% ʘ͸͔͍ͣ͠ʗ

Slide 28

Slide 28 text

BNFOEͰϝοηʔδमਖ਼ "EEJOEFYpMF $ # " )&"% ʘͳ͓ͬͨʗ HJUDPNNJUBNFOENl"EEJOEFYpMFz

Slide 29

Slide 29 text

͜ͷͱ͖ɺ࣮ࡍ͸ʜ "EEJOEFYpMF $ # " "EEJOFEYpMF $` )&"% w ίϛοτΛॻ͖׵͑ͨͷͰ͸ͳ͘ɺผͷ৽͍͠ί ϛοτΛ࡞ͬͯͦͪΒʹ)&"%ΛҠ͍ͯ͠Δ w ݩͷίϛοτ͸ḷΕͳ͘ͳͬͨͷͰπϦʔද͔ࣔ Β͸ফ͑Δ w ͳͷͰॻ͖׵ΘͬͨΑ͏ʹΈ͑Δ w දࣔ͞Εͳ͘ͳͬͯ΋಺෦తʹ࢒Γଓ͚Δ

Slide 30

Slide 30 text

աڈͷίϛοτΛॻ͖׵͑Δ $ # " PMENTH )&"% % & ͪΐͬͱ͚ͩ͜͜मਖ਼͍ͨ͠

Slide 31

Slide 31 text

SFCBTF $ #` " OFXNTH )&"% % & ʘͳ͓ͬͨʔʗ HJUSFCBTFJʢུ

Slide 32

Slide 32 text

Ͱ΋ຊ౰͸͜͏ͳͬͯΔ $ # " PMENTH )&"% % & $` #` %` &` OFXNTH

Slide 33

Slide 33 text

มΘͬͨͷ͸Ұ෦ͳΜ͔ͩΒ ͚ͩ͜͜Ͱ͍͍Μ͡Όʁ $ # " PMENTH )&"% % & #` OFXNTH

Slide 34

Slide 34 text

͜͏͍͏΋ͷͳΜͰ͢ $ # " % & $` #` %` &` w Ұ౓࡞ͬͨίϛοτ͸ʢجຊతʹʣॻ͖׵ ΘΒͳ͍ w ৽͍͠ίϛοτ͸*%͕มΘΔ w ਌*%͕มΘΔͷͰɺͨͱ͑ͦͷଞͷ಺༰͕ શ͘ಉ͡Ͱ΋৽͍͠ίϛοτͱͯ͠࡞Γ௚ ͞ΕΔ w ͭ·ΓͲ͔͜࡞Γ௚ͨ͠Β͔ͦ͜Βޙͷί ϛοτ͸࿈࠯తʹશͯ࡞Γ௚͠ʹͳΔ มߋͨ͠ ਌*%͕มΘͬͨ ͷ͔ͦ͏͔ ਌*%͕มΘͬͨ ͷ͔ͦ͏͔ ਌*%͕มΘͬͨ ͷ͔ͦ͏͔

Slide 35

Slide 35 text

ϒϥϯνΛ ফͪ͠Όͬͨ

Slide 36

Slide 36 text

͜Μͳϒϥϯν $ # " GFBU % & EFWFMPQ

Slide 37

Slide 37 text

ϒϥϯν࡟আ $ # " % & EFWFMPQ HJUCSBODI%GFBU ʘ͋ͬɺ΍ͬͺΓඞཁͩͬͨʗ

Slide 38

Slide 38 text

େৎ෉ ͦΕͰ΋औΓग़͢ खஈ͸͋Γ·͢

Slide 39

Slide 39 text

ϒϥϯνΛ෇͚௚͢ $ # " % & EFWFMPQ HJUSFqPH CCB)&"%!\^ʜ FCDDF)&"%!\^ʜ GCCC)&"%!\^ʜ HJUCSBODIOFXCSBODICCB OFXCSBODI w ίϛοτ͸ݟ͑ͳ͘ͳ͚ͬͨͩͰɺ࣮ࡍʹ͸ ফ͍͑ͯͳ͍ w )&"%ͷϩάͳͲ͔Βίϛοτ*%Λݟ͚ͭग़ ͯͦ͜͠ʹ৽ͨʹϒϥϯνͳͲΛ͚ͭΕ͹· ͨදࣔ͞ΕΔΑ͏ʹͳΔ

Slide 40

Slide 40 text

͜͜·Ͱͷ ·ͱΊ

Slide 41

Slide 41 text

w ϦϙδτϦͷத਎͸͜Μͳײ͡ ϙΠϯλͱίϛοτ܈ NBTUFS EFWFMPQ W )&"% ೖޱͱͳΔϙΠϯλ ແ਺ͷίϛοτ

Slide 42

Slide 42 text

Πϝʔδతʹ ͍͍ͩͨΘ͔Γ·ͨ͠ Ͷ

Slide 43

Slide 43 text

͔͜͜Β͸ ࣮ࡍͷத਎Λ ݟͯཧղ͠·͠ΐ͏

Slide 44

Slide 44 text

HJU

Slide 45

Slide 45 text

(JUͷॳظԽ XPSLJOHEJSFDUPSZ HJUJOJU

Slide 46

Slide 46 text

(JUͷॳظԽ SFGT HJU )&"% PCKFDUT XPSLJOHEJSFDUPSZ MPHT HJUJOJU HJUσΟϨΫτϦ͕࡞੒͞Εɺ͞ΒʹͦͷதʹۭσΟϨΫτϦ ܈͕࡞੒͞ΕΔʢ͜͜Ͱ͸ओཁͳ΋ͷͷΈʹهࡌΛলུʣ

Slide 47

Slide 47 text

ϑΝΠϧΛ࡞੒ͯ͠௥Ճ XPSLJOHEJSFDUPSZ pMFUYU FDIPpMFDPOUFOUpMFUYU HJUBEEpMFUYU

Slide 48

Slide 48 text

ϑΝΠϧΛ࡞੒ͯ͠௥Ճ SFGT HJU )&"% JOEFY PCKFDUT E B XPSLJOHEJSFDUPSZ pMFUYU MPHT FDIPpMFDPOUFOUpMFUYU HJUBEEpMFUYU 4)"ͷ*%͔ΒʮσΟϨΫτ Ϧ໊ϑΝΠϧ໊ʯͷϑΝΠϧ ʹ಺༰͕֨ೲ͞ΕΔ ݱࡏεςʔδ͞Ε͍ͯΔϑΝΠ ϧπϦʔ৘ใ ͜ͷ಺༰ͱϫʔΫϑΝΠϧΛ ൺֱͯࠩ͠෼͕දࣔ͞ΕΔ

Slide 49

Slide 49 text

࠷ॳͷίϛοτ XPSLJOHEJSFDUPSZ pMFUYU HJUDPNNJUNlJOJUJBMDPNNJUz

Slide 50

Slide 50 text

࠷ॳͷίϛοτ SFGT IFBET NBTUFS HJU )&"% JOEFY PCKFDUT FC DDF B E XPSLJOHEJSFDUPSZ pMFUYU MPHT )&"% SFGT IFBET NBTUFS HJUDPNNJUNlJOJUJBMDPNNJUz lFCDDFz ϒϥϯν͕ࢦࣔ͠͠ ͍ͯΔઌͷίϛοτ *% lSFGSFGTIFBET NBTUFSz ݱࡏϦϙδτϦͷͲ͜ Λࢀর͍ͯ͠Δͷ͔ͱ ͍͏ϙΠϯλ FCDDFNBTUFS!\^DPNNJU JOJUJBM JOJUJBMDPNNJU FCDDF)&"%!\^DPNNJU JOJUJBM JOJUJBMDPNNJU

Slide 51

Slide 51 text

w (JUΦϒδΣΫτͷߏ੒ΛݟͯΈΑ͏ HJUDBUpMFQFCDDF USFFBFCCDGECBEBDEEB BVUIPS.BTBZB,B[BNB DPNNJUUFS.BTBZB,B[BNB JOJUJBMDPNNJU HJUDBUpMFQB CMPCEBCDBBBEGFpMFUYU HJUDBUpMFQE pMFDPOUFOU PCKFDUT FC DDF B E ࠷ॳͷίϛοτͷத਎ $PNNJU0CKFDU ίϛοτ৘ใ 5SFF0CKFDU ϑΝΠϧϦετ৘ใ #MPC0CKFDU ϑΝΠϧͷத਎ NBTUFS

Slide 52

Slide 52 text

ϒϥϯνͷ࡞੒ XPSLJOHEJSFDUPSZ pMFUYU HJUCSBODIEFW

Slide 53

Slide 53 text

ϒϥϯνͷ࡞੒ SFGT IFBET NBTUFS EFW HJU )&"% JOEFY PCKFDUT FC DDF B E XPSLJOHEJSFDUPSZ pMFUYU MPHT )&"% SFGT IFBET NBTUFS EFW HJUCSBODIEFW FCDDF ϒϥϯνʹ৽͍͠ϙΠϯλ͕௥Ճ͞ΕΔɻ ͜ͷ࣌఺Ͱ͸NBTUFSͱಉҰ FCDDFEFW!\^CSBODI$SFBUFEGSPNNBTUFS

Slide 54

Slide 54 text

ϒϥϯνͷ੾Γସ͑ XPSLJOHEJSFDUPSZ pMFUYU HJUDIFDLPVUEFW

Slide 55

Slide 55 text

ϒϥϯνͷ੾Γସ͑ SFGT IFBET NBTUFS EFW HJU )&"% JOEFY PCKFDUT FC DDF B E XPSLJOHEJSFDUPSZ pMFUYU MPHT )&"% SFGT IFBET NBTUFS EFW HJUDIFDLPVUEFW SFGSFGTIFBETEFW )&"%ͷࢀরઌΛมߋ͢Δ ͜ͱͰϒϥϯν͕มΘΔ FCDDF)&"%!\^DIFDLPVUNPWJOHGSPNNBTUFSUPEFW FCDDF)&"%!\^DPNNJU JOJUJBM JOJUJBMDPNNJU

Slide 56

Slide 56 text

ճ໨ͷίϛοτ XPSLJOHEJSFDUPSZ pMFUYU pMFUYU FDIPpMF@UYUpMFUYU HJUBEEpMFUYU HJUDPNNJUNlBEEpMFz

Slide 57

Slide 57 text

ճ໨ͷίϛοτ SFGT IFBET NBTUFS EFW HJU )&"% JOEFY PCKFDUT G CCC FG BGFF CE FC E XPSLJOHEJSFDUPSZ pMFUYU pMFUYU MPHT )&"% SFGT IFBET NBTUFS EFW FDIPpMF@UYUpMFUYU HJUBEEpMFUYU HJUDPNNJUNlBEEpMFz GCCC)&"%!\^DPNNJUBEEpMF FCDDF)&"%!\^DIFDLPVUNPWJOHGSPNNBTUFSUPEFW FCDDF)&"%!\^DPNNJU JOJUJBM JOJUJBMDPNNJU GCCCEFW!\^DPNNJUBEEpMF FCDDFEFW!\^CSBODI$SFBUFEGSPNNBTUFS GCCC ৽͍͠ίϛοτʹϙΠϯλ ͕ॻ͖׵ΘΔ

Slide 58

Slide 58 text

w ॳճͱҧ͏ͱ͜Ζ HJUDBUpMFQGC USFFCEFBBEFCCFCCBC QBSFOUFCDDFDCGFFFGCDF BVUIPS.BTBZB,B[BNB DPNNJUUFS.BTBZB,B[BNB BEEpMF HJUDBUpMFQCE CMPCEBCDBBBEGFpMFUYU CMPCFGBGFFDFFDGGEEEGCFpMFUYU PCKFDUT G CCC CE E FG BGFF ճ໨ͷίϛοτͷத਎ ਌ͷίϛοτ*%͕௥Ճ͞Εͨ ෳ਺ϑΝΠϧʹͳͬͨ

Slide 59

Slide 59 text

NBTUFSʹϚʔδ XPSLJOHEJSFDUPSZ pMFUYU pMFUYU HJUDIFDLPVUNBTUFS HJUNFSHFEFW

Slide 60

Slide 60 text

NBTUFSʹϚʔδ SFGT IFBET NBTUFS EFW HJU )&"% JOEFY PCKFDUT CCB G FG FC E XPSLJOHEJSFDUPSZ pMFUYU pMFUYU MPHT )&"% SFGT IFBET NBTUFS EFW HJUDIFDLPVUNBTUFS HJUNFSHFEFW CCB)&"%!\^NFSHFEFW.FSHFNBEFCZUIF SFDVSTJWFTUSBUFHZ FCDDF)&"%!\^DIFDLPVUNPWJOHGSPNEFWUPNBTUFS GCCC)&"%!\^DPNNJUBEEpMF FCDDF)&"%!\^DIFDLPVUNPWJOHGSPNNBTUFSUPEFW FCDDF)&"%!\^DPNNJU JOJUJBM JOJUJBMDPNNJU CCBNBTUFS!\^NFSHFEFW.FSHFNBEFCZUIF SFDVSTJWFTUSBUFHZ FCDDFNBTUFS!\^DPNNJU JOJUJBM JOJUJBMDPNNJU CCB ৽͍͠ίϛοτΛࢀর SFGSFGTIFBETNBTUFS ݩͷNBTUFSϒϥϯνʹ໭Δ

Slide 61

Slide 61 text

w Ϛʔδίϛοτͷத਎ΛݟͯΈΑ͏ HJUDBUpMFQC USFFCEFBBEFCCFCCBC QBSFOUFCDDFDCGFFFGCDF QBSFOUGCCCCCECBFFGBCEECB BVUIPS.BTBZB,B[BNB DPNNJUUFS.BTBZB,B[BNB .FSHFCSBODIEFW PCKFDUT CCB CE E FG BGFF ճ໨ͷίϛοτ HJUDBUpMFQCE CMPCEBCDBBBEGFpMFUYU CMPCFGBGFFDFFDGGEEEGCFpMFUYU ϑΝΠϧ಺༰͸͖ͬ͞ͱಉ͡ Ϛʔδίϛοτ͸਌Λͭ࣋ͭ ࠷ॳͷίϛοτ ճ໨ͷίϛοτ

Slide 62

Slide 62 text

Ϛʔδίϛοτͷ਌ͭ " % $ # EFWFMPQ NBTUFS IFBE HJUDBUpMFQC USFFCEFBBEFCCFCCBC QBSFOUFCDDFDCGFFFGCDF QBSFOUGCCCCCECBFFGBCEECB FCDDF GCCC w ͭ໨ͷQBSFOU͸IFBEଆ w ͭ໨͸NFSHFࢦఆଆ

Slide 63

Slide 63 text

·ͱΊ w ࡞ۀதͷϑΝΠϧ͸ͱʹ͔͘ίϛοτ͓ͯ͜͠͏ w Ұ౓ίϛοτͨ͠಺༰͸ɺSFTFUIBSEͨ͠Γϒ ϥϯνফͯ͠ݟ͑ͳ͘ͳͬͯ΋ࣦΘΕ͍ͯͳ͍ w ϒϥϯν͸ͨͩͷᐼ w ؾܰʹ࡞ͬͨΓফͨ͠Γ͠Α͏ w ίϛοτ͸ʢݪଇʣॻ͖׵͑ෆՄ w ৽͘͠࡞Γ௚͍ͯ͠ΔΘ͚ͳͷͰɺϦϞʔτͷଞͷ ࡞ۀऀͱಉظ͢Δͱ͖͸஫ҙ

Slide 64

Slide 64 text

͜ΕͰ΋͏ ෼͔Γ·ͨ͠ Ͷ