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

Slide 1

Slide 1 text

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

Slide 2

Slide 2 text

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

Slide 3

Slide 3 text

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

Slide 4

Slide 4 text

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

Slide 5

Slide 5 text

ίϛοτϋογϡJTԿ

Slide 6

Slide 6 text

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

Slide 7

Slide 7 text

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

Slide 8

Slide 8 text

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

Slide 9

Slide 9 text

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

Slide 10

Slide 10 text

HJUMPHEFDPSBUF

Slide 11

Slide 11 text

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

Slide 12

Slide 12 text

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

Slide 13

Slide 13 text

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

Slide 14

Slide 14 text

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

Slide 15

Slide 15 text

HJUDIFDLPVUW master branch_1 branch_2 v0.9 v0.8 HEAD

Slide 16

Slide 16 text

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

Slide 17

Slide 17 text

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

Slide 18

Slide 18 text

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

Slide 19

Slide 19 text

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

Slide 20

Slide 20 text

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

Slide 21

Slide 21 text

NFSHFͱ͸ master branch_1 branch_2 HEAD

Slide 22

Slide 22 text

HJUNFSHFCSBODI@ master branch_1 branch_2 HEAD

Slide 23

Slide 23 text

HJUNFSHFCSBODI@ branch_1 branch_2 master HEAD

Slide 24

Slide 24 text

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

Slide 25

Slide 25 text

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

Slide 26

Slide 26 text

SFCBTFͱ͸ master branch_1 branch_2 HEAD ˞)&"%͕CSBODI@ʹͳ͍ͬͯ·͢

Slide 27

Slide 27 text

HJUSFCBTFNBTUFS master branch_2 branch_1 HEAD

Slide 28

Slide 28 text

ίϛοτϋογϡΛݟͯΈΑ͏ master branch_2 branch_1 HEAD 0c3da 9sbde kecak 3dp00 vvynm 3dmbb venat cemat 19ng8

Slide 29

Slide 29 text

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

Slide 30

Slide 30 text

ίϯϑϦΫτͨ͠Β master branch_2 HEAD branch_1 HEAD ͜ΕΛ࡞Ζ͏ͱͯ͠ ίϯϑϦΫτ

Slide 31

Slide 31 text

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

Slide 32

Slide 32 text

ࠩ෼৘ใʹண໨ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU lighty を kitak に kitak を antipop に HJUEJGGΛΠϝʔδͯ͠

Slide 33

Slide 33 text

ίϯϑϦΫτͷΠϝʔδ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU LJUBL BOUJQPQ લ͕ MJHIUZ ͡Όͳ͍ lighty を kitak に

Slide 34

Slide 34 text

ίϯϑϦΫτͷղফ LFODIBO MJHIUZ LJUBL BOUJQPQ ITCU LJUBL BOUJQPQ hsbt を kitak に kitak を antipop に

Slide 35

Slide 35 text

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

Slide 36

Slide 36 text

ௐ΂ͯΈΑ͏ SFCBTFͱDIFSSZQJDL SFCBTFPOUP SFCBTFJ

Slide 37

Slide 37 text

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

Slide 38

Slide 38 text

A HJUGFUDIHJUNFSHF

Slide 39

Slide 39 text

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

Slide 40

Slide 40 text

A HJUGFUDIHJUSFCBTF

Slide 41

Slide 41 text

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

Slide 42

Slide 42 text

྆ํͰNBTUFSʹมߋ͕͋Δ master HJUIVCDPN MPDBM master origin/master

Slide 43

Slide 43 text

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

Slide 44

Slide 44 text

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

Slide 45

Slide 45 text

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

Slide 46

Slide 46 text

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

Slide 47

Slide 47 text

HJUQVMMSFCBTF SFCBTF master HJUIVCDPN MPDBM master origin/master 8neae h3nal 8neae loen3

Slide 48

Slide 48 text

HJUQVMM HJUQVMMGFUDINFSHF ϦϞʔτϦϙδτϦ͔Βखݩʹͳ͍ ίϛοτΛऔಘ͢Δͷ͕GFUDI GFUDI͔ͯ͠ΒͦΕΛϩʔΧϧϒϥ ϯνʹ൓ө͢Δํ๏ΛɺNFSHF͔ SFCBTF͔Ͱબ୒Ͱ͖Δ

Slide 49

Slide 49 text

ߟ͑ͯΈΑ͏ HJUQVTI͸ԿΛ͍ͯ͠Δͷ͔ ϒϥϯνΛSFCBTF͢ΔͱQVTIG ͕ඞཁʹͳΔཧ༝͸ͳ͔ͥ