Link
Embed
Share
Beginning
This slide
Copy link URL
Copy link URL
Copy iframe embed code
Copy iframe embed code
Copy javascript embed code
Copy javascript embed code
Share
Tweet
Share
Tweet
Slide 1
Slide 1 text
Gitߨश 2014.04.15
Slide 2
Slide 2 text
͜ΜΜ
Slide 3
Slide 3 text
ߨࢣ հ • masawada • ใཧֶ෦ ใɾ௨৴ֶՊ 3 ίϯϐϡʔλαΠΤϯείʔε • Θ͔Βͳ͍͜ͱ͕͋Ε
[email protected]
·ͨ @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) = มߋཤྺΛه / ཧ͢ΔιϑτΣΞ ! ଞʹSubversionBazzarͳͲ…
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] ࢦఆͨ͠ίϛοτΛଧͪফ͢ίϛοτΛ࡞͢Δ ͦͷίϛοτͰՃͨ͠෦Λͬͦ͝Γআ͢Δ
Slide 58
Slide 58 text
͜͜·ͰΛσϞ
Slide 59
Slide 59 text
ͦͷଞͷTips
Slide 60
Slide 60 text
.gitignore .DS_Store.swpͳͲͷ͍Βͳ͍ϑΝΠϧΛ Ճ͠ͳ͍Α͏ʹͰ͖Δ
Slide 61
Slide 61 text
͜͜·ͰΛσϞ
Slide 62
Slide 62 text
࠷ޙʹ
Slide 63
Slide 63 text
·ͩ·ͩػೳ ͨ͘͞Μ͋Δ
Slide 64
Slide 64 text
No content
Slide 65
Slide 65 text
͋Γ͕ͱ͏͍͟͝·ͨ͠