Git講習 2014.04.15 - Speaker Deck

Slide 1

Slide 1 text

Gitߨश 2014.04.15

Slide 2

Slide 2 text

͜Μ͹Μ͸

Slide 3

Slide 3 text

ߨࢣ ঺հ • masawada • ৘ใཧ޻ֶ෦ ৘ใɾ௨৴޻ֶՊ 3೥  ίϯϐϡʔλαΠΤϯείʔε • Θ͔Βͳ͍͜ͱ͕͋Ε͹  tetra1984@gmail.com·ͨ͸  @masawada (Twitter) ·Ͱ

Slide 4

Slide 4 text

ຊ೔ͷ͓͠ͳ͕͖ • Gitͱ͸ • جຊతͳίϚϯυ / ߟ͑ํ • Gitͷத਎ΛΈͯΈΑ͏

Slide 5

Slide 5 text

ߨशΛߦ͏ʹ͋ͨͬͯ • ࣮ࡍʹίϚϯυΛଧͪͳ͕Βઆ໌͠·͢ɻ • Մೳͳํ͸͓खݩͷ୺຤Ͱ͓ࢼ͍ͩ͘͠͞ɻ • ࢿྉ͸WebαΠτʹΞοϓϩʔυ͞Ε͍ͯ·͢ɻ

Slide 6

Slide 6 text

Gitͱ͸

Slide 7

Slide 7 text

Gitͱ͸ όʔδϣϯ؅ཧγεςϜ (VCS)  = มߋཤྺΛه࿥ / ؅ཧ͢Διϑτ΢ΣΞ ! ଞʹ΋Subversion΍BazzarͳͲ…

Slide 8

Slide 8 text

ྫ͑͹ • Ϩϙʔτ΍ϓϩάϥϜΛॻ͍͍ͯͯ  ۠੾Γͷྑ͍ͱ͜ΖͰอଘ͓͖͍ͯͨ͠ • ·ͱ΋ʹॻ͚͍ͯΔ / ಈ͍͍ͯΔঢ়ଶͷ΋ͷΛ  อଘ͓͍ͯ͠ɺ໰୊͕ൃੜͨ͠ͱ͖ʹ  ໭ͤΔΑ͏ʹ͍ͨ͠

Slide 9

Slide 9 text

͍··Ͱͷ มߋཤྺ؅ཧ

Slide 10

Slide 10 text

ϑΝΠϧϕʔε

Slide 11

Slide 11 text

Excelϕʔε

Slide 12

Slide 12 text

खಈͰมߋཤྺΛ؅ཧ͢ΔͷͰ ਓҝతͳϛε͕ଟ͘ͳΔ ͜ΕΒΛ͢΂ͯ ࣗಈԽ͍ͨ͠

Slide 13

Slide 13 text

ͱ͍͏ߟ͑ͷ΋ͱੜ·Εͨͷ͕ όʔδϣϯ؅ཧγεςϜ

Slide 14

Slide 14 text

ɾҰ೥࣍ޙظͷجૅϓϩάϥϛϯά͓Αͼԋश → Cݴޠͷॻ͖ํΛֶͿ → มߋཤྺΛ؅ཧ͢Δඞཁ͕͋·Γͳ͍ ! ! ɾຊϫʔΫγϣοϓ → ಈ͘ϞϊΛ࡞Δ → มߋཤྺΛ؅ཧ͢Δඞཁ͕͋Δ

Slide 15

Slide 15 text

جૅฤ

Slide 16

Slide 16 text

جૅฤ • ϦϙδτϦ (repository) • ίϛοτ (commit)

Slide 17

Slide 17 text

ϦϙδτϦͱ͸ σʔλͷมߋཤྺΛ؅ཧ͢Δ ா฽ͷΑ͏ͳ΋ͷ

Slide 18

Slide 18 text

ίϛοτͱ͸ ϦϙδτϦʹରͯ͠ มߋཤྺΛ௥Ճ͢Δ͜ͱ

Slide 19

Slide 19 text

ίϛοτ࡞੒ͷྲྀΕ 1. ϫʔΫπϦʔͰϑΝΠϧΛ௥Ճ/มߋ/࡟আ͢Δ 2. ͋Δఔ౓·ͱ·ͬͨΒΠϯσοΫεʹ௥Ճ͢Δ  ΠϯσοΫεͱ͸ɺػೳ͝ͱͳͲʹ෼͚ͯίϛοτΛ  ࡞ΔͨΊʹมߋͨ͠ϑΝΠϧΛཷΊΔ৔ॴ  ΠϯσοΫεʹొ࿥͞Ε͍ͯͳ͍ϑΝΠϧ͸ίϛοτ͞Εͳ͍ 3. ΠϯσοΫεͷ಺༰ΛϦϙδτϦʹίϛοτ͢Δ

Slide 20

Slide 20 text

ϦϙδτϦͱίϛοτ ϫʔΫπϦʔ ΠϯσοΫε ϦϙδτϦ (࡞ۀσΟϨΫτϦ)

Slide 21

Slide 21 text

ϦϙδτϦͷॳظԽ $ git init

Slide 22

Slide 22 text

ΠϯσοΫεʹมߋΛొ࿥ $ git add [filename] $ git add .

Slide 23

Slide 23 text

ίϛοτͷ࡞੒ $ git commit $ git commit -m “message”

Slide 24

Slide 24 text

ϑΝΠϧͷঢ়ଶΛදࣔ $ git status

Slide 25

Slide 25 text

มߋཤྺͷදࣔ $ git log

Slide 26

Slide 26 text

͜͜·ͰΛσϞ

Slide 27

Slide 27 text

ࠩ෼ͷදࣔ $ git diff [old] [new]

Slide 28

Slide 28 text

͜͜·ͰΛσϞ

Slide 29

Slide 29 text

ϒϥϯνฤ

Slide 30

Slide 30 text

ϒϥϯνͱ͸ ࢬ

Slide 31

Slide 31 text

ϒϥϯνͱ͸ ࢧ෦, ࢧہ

Slide 32

Slide 32 text

ϒϥϯνͱ͸ • ෳ਺ͷػೳΛಉ࣌ʹฒߦͯ͠࡞੒Ͱ͖Δ • νʔϜ։ൃΛ͢Δͱ͖ʹϒϥϯνΛ࡞Δ͜ͱͰ  ଞਓͷมߋʹ໎࿭Λ͔͚ͳ͍Α͏࡞ۀͰ͖Δ • ෆ҆ͳ࡞ۀ͸ϒϥϯνΛ࡞͔ͬͯΒߦ͏͜ͱͰ  ϒϥϯνΛফ͚ͩ͢Ͱݩͷঢ়ଶʹ໭ΕΔ

Slide 33

Slide 33 text

ϒϥϯνͱ͸

Slide 34

Slide 34 text

ϒϥϯνͷ࡞੒ $ git branch [name]

Slide 35

Slide 35 text

ϒϥϯνͷ৐Γ׵͑ $ git checkout [name]

Slide 36

Slide 36 text

ϒϥϯνͷ࡞੒ͱ৐Γ׵͑ $ git checkout -b [name]

Slide 37

Slide 37 text

ϒϥϯνͷ౷߹ $ git merge [name]

Slide 38

Slide 38 text

ϒϥϯνͷ࡟আ $ git branch -d [name] $ git branch -D [name] merge͞Ε͍ͯͳ͍ϒϥϯν͸-DͰফ͢

Slide 39

Slide 39 text

͜͜·ͰΛσϞ

Slide 40

Slide 40 text

ϒϥϯνͷڝ߹

Slide 41

Slide 41 text

ϒϥϯνͷڝ߹ 1. master͔Βfeature_1, feature_2ϒϥϯνΛ࡞੒ 2. feature_1ϒϥϯνʹػೳΛ௥Ճɺίϛοτ͢Δ 3. feature_1ϒϥϯνΛmasterϒϥϯνʹmerge 4. feature_2ϒϥϯνʹػೳΛ௥Ճɺίϛοτ͢Δ 5. feature_2ϒϥϯνΛmasterϒϥϯνʹmerge

Slide 42

Slide 42 text

ϒϥϯνͷڝ߹ master feature_1 feature_2

Slide 43

Slide 43 text

࣮ࡍʹσϞ

Slide 44

Slide 44 text

ϦϞʔτϦϙδτϦ

Slide 45

Slide 45 text

ϦϞʔτϦϙδτϦ • ϦϙδτϦΛαʔόʹόοΫΞοϓ • ϦϙδτϦΛଞਓͱڞ༗Ͱ͖Δ

Slide 46

Slide 46 text

GitϦϙδτϦ ϗεςΟϯάαʔϏε

Slide 47

Slide 47 text

ϦϞʔτϦϙδτϦͷొ࿥ $ git remote add [name] [url]

Slide 48

Slide 48 text

ϦϞʔτϦϙδτϦͷऔಘ $ git clone [url]

Slide 49

Slide 49 text

ϦϞʔτϦϙδτϦͷߋ৽ $ git push $ git push -u [name] [branch]

Slide 50

Slide 50 text

ϩʔΧϧϦϙδτϦͷߋ৽ $ git pull

Slide 51

Slide 51 text

͜͜·ͰΛσϞ

Slide 52

Slide 52 text

ίϛοτͷ औΓফ͠/΍Γ௚͠

Slide 53

Slide 53 text

௚લͷίϛοτͷ΍Γͳ͓͠ $ git commit --amend ͻͱͭ·͑ͷίϛοτΛ΍Γͳ͓͢

Slide 54

Slide 54 text

ΠϯσοΫε௥ՃͷऔΓফ͠ $ git reset ΠϯσοΫεʹ௥Ճͨ͠ϑΝΠϧͷϦετΛ ΠϯσοΫε͔ΒऔΓআ͘

Slide 55

Slide 55 text

ίϛοτͷ࡟আ $ git reset --hard [commit] ࢦఆͨ͠ίϛοτ·Ͱ໭Δ ࢦఆίϛοτ͔Βݱࡏ·Ͱͷίϛοτ͸࢒Βͳ͍

Slide 56

Slide 56 text

ίϛοτͷ࡟আ $ git reset --soft [commit] ࢦఆͨ͠ίϛοτ·Ͱ໭Δ ϫʔΫπϦʔͷมߋཤྺ͸࢒Δ

Slide 57

Slide 57 text

ίϛοτͷଧͪফ͠ $ git revert [commit] ࢦఆͨ͠ίϛοτΛଧͪফ͢ίϛοτΛ࡞੒͢Δ ͦͷίϛοτͰ௥Ճͨ͠෦෼Λͬͦ͝Γ࡟আ͢Δ