はじめてのGit #gitkyoto

Slide 1

Slide 1 text

͸͡ΊͯͷGit ͨͿΜؔ੢Ͱ͍ͪ͹ΜΏΔ͍Gitೖ໳

Slide 2

Slide 2 text

ͨͳ͔ͻͯ͞Δ @tanakahisateru Pinoco developer js-markdown-extra maintainer PHPTAL contributor Firebug translation contributor Yii framework user ...and more OSS experienced

Slide 3

Slide 3 text

Կऀ͔ͱ͍͏࿩ΛΘ ͔Γ΍͍͢ͱ͜Ͱ ͸͍͜ΕͰࠓ೔஻ͬͨਓ͕୭ͩͬ ͔ͨ๨Εͳ͘ͳΓ·ͨ͠

Slide 4

Slide 4 text

๻͸ͦΜͳGitͷ͍͢͝ਓ͡Όͳ͍Ͱ͢ɻ GitHubͰඞཁͳ࠷௿ݶͷ஌͔ࣝ͋͠Γ·ͤΜɻ Θ͔Βͳ͍͜ͱ͸͙͢άάΓ·͢ɻ Git͸ଞਓͱ࢖ͬͯφϯϘͰ͠ΐͬͯࢥ͍·͢ɻ Θͨ͠ͱGit

Slide 5

Slide 5 text

ਓʹGitΛڭ͑Δͱ͜͏ͳͬͨ લ৬Ͱ͸ɺσβΠφʔ(ίʔμʔ)ͷಉ྅΍ΫϥΠΞϯτʹGit Λڭ͑ͯ࢖ͬͯ΋Βͬͯ·ͨ͠ɻ σβΠφʔ͸ʮ͜Εͳ͔ͬͨΒ࢓ࣄͰ͖ͳ͍ʯͬͯதಟʹͳ Γ·ͨ͠ɻ ΫϥΠΞϯτͱͷ΍ΓͱΓ͕௒εϜʔζʹͳΓ·ͨ͠ɻ

Slide 6

Slide 6 text

ڭ͑ͳ͖ΌଛͩΑ͜Ε

Slide 7

Slide 7 text

͜ͷηογϣϯͰ͸ ϗϯτͷೖ໳͔Βͪΐͬͱ͚ͩ౿ΈࠐΜͰ࢝Ί·͢ɻ Έͳ͞Μ͕৬৔ͳΓऔҾઌͳΓͰɺ෍ڭ͢ΔଆͷਓʹͳΔ͙ Β͍ͷதಟʹ͢Δͷ͕໨ඪͰ͢ɻ(ॳ৺ऀͱ͔ؔ܎ͳ͍Ͱ͢) ڭΘΒͳͯ͘΋Θ͔ͬͯΔਓ͸ɺڭ͑ํͷώϯτΛύΫͬͯ ͍ͩ͘͞ɻGit͸ଞਓͱ࢖ͬͯφϯϘͰ͢ɻ

Slide 8

Slide 8 text

όʔδϣϯ؅ཧͬͯ? ࣮͸Έͳ͞ΜɺͨͿΜ͢Ͱʹόʔδϣϯ؅ཧΛ΍͍ͬͯΔͱ ࢥ͍·͢Αɻ ೔෇໊Λ͚ͭͯϑΥϧμΛόοΫΞοϓ͢ΔΞϨɻ

Slide 9

Slide 9 text

No content

Slide 10

Slide 10 text

͜ͷ΁Μ·ͩ΍Δؾ͋Δ

Slide 11

Slide 11 text

ʮͪΐͬͱෳ਺ҊݟͤͯΑʯ ʮ͑ͬ...ʯ

Slide 12

Slide 12 text

ʮ΍ͬͺΓલͷલͷ͕ྑ͔ͬͨʯ (΍Δؾͳ͘ͳ͖ͬͯͯΔײ)

Slide 13

Slide 13 text

ʮ΍ͬͱϑΟοΫεҊͰ͖ͨ...όλοʯ

Slide 14

Slide 14 text

ʮͬͦ͘͞Ͱѱ͍Μ͚ͩͲ௚͕͠...ʯ (นυϯͰ͢ΑͶ)

Slide 15

Slide 15 text

਺೔ޙ

Slide 16

Slide 16 text

Ͳͷࢠ͕Ͳͷࢠ͔͠Β...?

Slide 17

Slide 17 text

ख࡞ۀͷ᠘ ਓؒ͸αϘΔ/যΔ/ؒҧ͑Δɻ ϑΥϧμͷલޙؔ܎ʹอূ͕ͳ͍ɻ ୭͕ԿΛͨ݁͠Ռͳͷ͔Θ͔Βͳ͍ɻ ϋʔυσΟεΫʹ΄ͱΜͲಉ͡಺༰ͷϑΥϧμͰ͖ͯɺ ͍͢͝ૣ͞Ͱ༰ྔΛѹഭͯ͘͠Δɻ

Slide 18

Slide 18 text

ͦΜͳ͋ͳͨ΋ GitΛ࢖͏ͱ

Slide 19

Slide 19 text

͜͏ͳΓ·͢

Slide 20

Slide 20 text

͞Βʹ͜͏ͳΓ·͢

Slide 21

Slide 21 text

೔෇ϑΥϧμͱͷ͕͍ͪ ୭͕ɺ͍ͭɺԿΛมߋͨ͠ͷ͔ཤྺʹ࢒Δɻ Ͳͷมߋ͕ͲΕΛݩʹͨ͠ͷ͔ɺॱ൪Λؒҧ͑ͳ͍ɻ ਖ਼ࣜͳ࠷৽൛͕Θ͔Δͱ͍͏େࣄ͞ɻ มߋ৘ใ͚ͩΛอଘ → ϋʔυσΟεΫΛѹഭ͠ͳ͍ɻ (ͳͷͰԕྀͳ͘όοΫΞοϓͰ͖Δ)

Slide 22

Slide 22 text

Subversion < Git ॳ৺ऀʹ͸(ͦͯ͠ଟ෼কདྷͣͬͱ)Git͕Φεεϝɻ αʔόͷ४උ͕·ͩͰ΋࡞ۀΛ࢝ΊΒΕΔɻ FinderͰউखʹҠಈ/࡟আ/໊લมߋΛͯ͠΋յΕͳ͍ɻ มߋཤྺͷࢀর͕ͱͯ΋଎͍ɻ ϓϥάΠϯ͕ͳ͍ͷͰਓʹΑͬͯػೳͷ͕ࠩग़ͳ͍ɻ (͜Ε͸Mercurialʹର͢ΔϝϦοτ)

Slide 23

Slide 23 text

Ͳ͏ͤGit͸ඞཁ

Slide 24

Slide 24 text

ΈΜͳGitHub ΋ͬͱ͋ΔΑ

Slide 25

Slide 25 text

΍ͬͯΈΑ͏

Slide 26

Slide 26 text

Πϯετʔϧ ࠷৽ͷXcodeΛ࢖͍ͬͯΔ ਓ͸΋͏ೖ͍ͬͯ·͢ɻ ͳ͍ਓ͸ͪ͜Β http://git-scm.com/

Slide 27

Slide 27 text

Ͱɺ࣍͸...

Slide 28

Slide 28 text

No content

Slide 29

Slide 29 text

଴ͬͯɺ͜Θ͘ͳ͍͔Β

Slide 30

Slide 30 text

͜Ε͔Β΍Ζ͏ͱͯ͠Δ͜ͱ ʮGit͸ίϚϯυͩʯͱ͍͏͜ͱΛ஌ͬͯ΋Β͍·͢ɻ ίϚϯυΛଧͪࠐΈͳ͕Β༻ޠΛ͓΅͑·͠ΐ͏ɻ ࣦഊͯ͠΋େৎ෉ɺ໨త͸ૢ࡞͡Όͳͯ͘ཧղͰ͢ɻ ֓೦Λཧղ͔ͯ͠ΒGUI΁ɻ ͦͷͱ͖͸΋͏ɺίϚϯυ͸๨Ε͍͍ͯͯɻ

Slide 31

Slide 31 text

< \ｺﾜｸﾅｲｶﾗ/

Slide 32

Slide 32 text

͏͖͝·͔͢

Slide 33

Slide 33 text

ࣗ෼ͷ໊લΛઃఆ͠Α͏

Slide 34

Slide 34 text

࡞ۀऀͷ໊લ͸ࣗݾਃࠂͰ͢ɻ Git͸ࣗ෼Ͱউखʹ࢝ΊͨΓผͷαʔόʹҾӽͨ͠ΓͰ͖ΔͷͰɺ ୭͕࡞ۀ͔ͨ͠ͱ͍͏໊લ͸αʔόͷೝূͱ͸׬શʹผͳͷͰ͢ɻ

Slide 35

Slide 35 text

͜ͷ࿅शͰ࢖͏ ιʔείʔυΛ...

Slide 36

Slide 36 text

http://www.initializr.com/ ύΫΓ·͢Ͷ

Slide 37

Slide 37 text

IEͱ͔Faviconͱ͔ΦϑͰ

Slide 38

Slide 38 text

μ΢ϯϩʔυ&ల։

Slide 39

Slide 39 text

͜Ε͕ॳ൛Ͱ͢

Slide 40

Slide 40 text

No content

Slide 41

Slide 41 text

࡞ۀ͢ΔϑΥϧμΛ։͘ cd[εϖʔε]ͷ͋ͱɺλʔϛφϧʹ ϑΥϧμΛυϩοϓ͠·͢ɻ

Slide 42

Slide 42 text

͍·։͖·ͨ͠

Slide 43

Slide 43 text

ݱࡏλʔϛφϧͰ։͍͍ͯΔϑΥϧμΛʮΧ ϨϯτσΟϨΫτϦʯͱݴ͍·͢ɻ cd ͷޙʹύεΛࢦఆ͢ΔͱɺΧϨϯτσΟϨ ΫτϦΛม͑Δ͜ͱ͕Ͱ͖·͢ɻ ΧϨϯτσΟϨΫτϦͷ֬ೝ͸ pwd Ͱ͢ɻ

Slide 44

Slide 44 text

ϗϯτʹ߹ͬͯΔ?

Slide 45

Slide 45 text

͜ͷ΁Μେৎ෉Ͱ͔͢ʔ

Slide 46

Slide 46 text

͍Α͍ΑGitͰ͢Αʔ

Slide 47

Slide 47 text

git init

Slide 48

Slide 48 text

.git=ϩʔΧϧϦϙδτϦ

Slide 49

Slide 49 text

ϦϙδτϦ=ೖΕ෺ .git ͕ফ͑ΔͱԿ΋ͳ͔ͬͨ͜ͱʹͳΔɻ શ෦΍Γ௚͍ͨ͠ͱ͖͸ rm -rf .git (͋Δ͍͸ৄ͍͠ਓʹͬͦ͜Γฉ͖·͠ΐ͏)

Slide 50

Slide 50 text

git status

Slide 51

Slide 51 text

Untracked ﬁles = ·ͩ؅ཧ͍ͯ͠ͳ͍ϑΝΠ ϧ͕͜Ε͚ͩ͋Δͱ͍͏͜ͱɻ git add Λ࢖͑ͱݴΘΕ͍ͯ·͢Ͷɻ

Slide 52

Slide 52 text

git add

Slide 53

Slide 53 text

add = ίϛοτ(͋ͱͰݴ͍·͢)͢ΔϦετʹϑΝ Πϧ௥Ճ͢Δͱ͍͏ҙຯͰ add Ͱ͢ɻ ͜ͷૢ࡞Λεςʔδͱݴ͍·͢ɻ όʔδϣϯ؅ཧͰ΋ͬͱ΋େࣄͳૢ࡞ɺίϛοτ ͷ४උͰ͢ɻ ͪΐ͏ͲɺFinderͰγϑτΩʔΛԡ͠ͳ͕ΒϑΝΠ ϧΛϙνϙν͢ΔΑ͏ͳ΋ͷͰ͢ɻ

Slide 54

Slide 54 text

͔Βͷ→ git status

Slide 55

Slide 55 text

git status ͷ݁Ռ͕ Changes to be committed: ͱ͍͏ϦετʹͳΓ·ͨ͠ɻ ͍Α͍Α͕࣍ॳΊͯͷίϛοτͰ͢ɻ

Slide 56

Slide 56 text

git commit -m “...”

Slide 57

Slide 57 text

ॳճίϛοτ͓ΊͰͱ͏͍͟͝·͢ɻίϛοτ ͸όʔδϣϯ؅ཧͰ΋ͬͱ΋ॏཁͳػೳͰ͢ɻ બΜͩϑΝΠϧΛ .git ϑΥϧμͷதʹόοΫΞ οϓίϐʔͨ͠ΠϝʔδͰ͢ɻ ֤ίϛοτʹ͸ɺ࡞ۀऀͷ໊લɺίϛοτͷ೔ ࣌ɺϝοηʔδ͕ඞͣ࢒Γ·͢ɻ

Slide 58

Slide 58 text

-m ͳ͠Ͱ git commit ͱͯ͠͠·͍ɺͳʹ͕ ى͔ͬͨ͜Θ͔Βͳ͍ਓ͸ɺۙ͘ͷৄͦ͠͏ ͳਓʹฉ͍͍ͯͩ͘͞ɻ Θ͔Δਓ͸ͦͷ··ଓ͚ɺ:wq Ͱऴྃͨ͠Β ͍͍ͱࢥ͍·͢ɻ Θ͔Βͳ͍ਓ͸GUIΛ࢖͏·Ͱ଴ͬͯͶɻ

Slide 59

Slide 59 text

git status ...? → git log ...!

Slide 60

Slide 60 text

git status ͸ nothing to commit (working directory id clean)ͱݴ͍ͬͯ·͢ɻ࠷ޙͷίϛ οτ͔Β·ͩมߋ͕ͳ͍ͱ͍͏ҙຯͰ͢ɻ git log ͰաڈͷίϛοτΛࢀরͰ͖·͢ɻ ίϛοτʹ 00e8ac1be367fb350... ͱ͍͏ID͕෇ ͍͍ͯΔ͜ͱ͕Θ͔Γ·͢ɻ͜ͷίϛοτͷϢ χʔΫͳ؅ཧ൪߸ͰɺΘΓͱॏཁͰ͢ɻ

Slide 61

Slide 61 text

৺഑ͳΒ git log --stat

Slide 62

Slide 62 text

΋͠ .DS_Store ͰάνάνݴΘΕΔਓ͸...

Slide 63

Slide 63 text

.gitignore ͱ͍͏ϑΝΠϧʹ

Slide 64

Slide 64 text

.DS_Store ͱॻ͖·͢

Slide 65

Slide 65 text

.gitignore = git + ignore (ແࢹ) ແࢹ͢ΔϑΝΠϧ໊΍ύεͷύλʔϯΛॻ͘

Slide 66

Slide 66 text

͜͜·Ͱͷ·ͱΊ git init git status git add <ﬁle/folder> git commit -m “message” git log .gitignore

Slide 67

Slide 67 text

Ή͔͍ͣ͠ͻͱʔ

Slide 68

Slide 68 text

ͦ͏Ͱ͢Ͷ...

Slide 69

Slide 69 text

༊͠੒෼ิॆ͠ͱ͖·͢

Slide 70

Slide 70 text

͔͜͜Β໘ന͘ ͳΔΑɻ index.htmlʹ มߋൃੜɻ

Slide 71

Slide 71 text

git status

Slide 72

Slide 72 text

git diff

Slide 73

Slide 73 text

git commit -a -m “...”

Slide 74

Slide 74 text

git commit -a ͸มߋ͞ΕͨϑΝΠϧΛ͢΂ͯ add ͔ͯ͠Βίϛοτͱ͍͏ҙຯͰ͢ɻ git add Ͱεςʔδ͔ͯ͠Β git commit ͢Δ ͷͱಉ͡Ͱ͢ɻ

Slide 75

Slide 75 text

git log

Slide 76

Slide 76 text

ϩάͷ݁Ռ͕2ͭʹͳΓ·ͨ͠ɻ ʮιʔεΛมߋͯ֬͠ೝɾίϛοτʯΛࣗ༝ ʹ΍ͬͯΈ·͠ΐ͏ɻ

Slide 77

Slide 77 text

࡞ۀ͕۠੾ΕͨΒ͙͢ʹίϛοτ͠·͠ΐ ͏ɻ ࠩ෼อଘͳͷͰ༰ྔ͸৯͍·ͤΜɻԕྀͳ͘ ͲΜͲΜ΍Γ·͠ΐ͏ɻ(※ Photoshop͸ผ) ස౓ͷ໨҆͸ɺ1ߦͷϝοηʔδͰҙຯΛද ͤΔఔ౓ͷมߋηοτͰ͢ɻ

Slide 78

Slide 78 text

͜͜·Ͱͷ·ͱΊ git status ΍ git diff Ͱঢ়ଶΛ֬ೝͭͭ͠... มߋ → ίϛοτ → มߋ → ίϛοτ → ... ͜͜͸೉͘͠ͳ͍Ͱ͢Ͷɻ

Slide 79

Slide 79 text

ͭ͗ɺͪΐͬͱ೉͍͠࿩ʹͳΓ·͢ɻ

Slide 80

Slide 80 text

< \ｺﾜｸﾅｲｶﾗ/

Slide 81

Slide 81 text

HTMLͷߋ৽Λ͠ͳ͕Β ཪͰίπίπCSSΛม͍͑ͨ

Slide 82

Slide 82 text

ϒϥϯν

Slide 83

Slide 83 text

git branch css-coding git checkout css-coding

Slide 84

Slide 84 text

css-coding ͱ͍͏໊લͷϒϥϯνΛ࡞Γɺϒ ϥϯνΛ੾Γସ͑·ͨ͠ɻ ׳Ε͍ͯΔਓ͸ git checkout -b css-coding Ͱɺ࡞੒ͱ੾Γସ͑Λಉ࣌ʹͰ͖·͢ɻ

Slide 85

Slide 85 text

git branch (ύϥϝʔλͳ͠)

Slide 86

Slide 86 text

ϒϥϯν͕2ͭ͋Δ͜ͱɺࠓͷϒϥϯν͕ css-codingͩͱ͍͏͜ͱ͕Θ͔Γ·͢ɻ master = ࠷ॳ͔Β͋ΔϝΠϯͷϒϥϯν

Slide 87

Slide 87 text

css-coding ϒϥϯνͰɺ css/main.css Λॻ͖׵͑ɻ

Slide 88

Slide 88 text

commit → log

Slide 89

Slide 89 text

H1 HENKOU → CSS PINK ͱ͍͏มߋͷྲྀΕ Ͱͨ͠Ͷɻ͜ΕΛԱ͓͍͍͑ͯͯͩ͘͞ɻ (ਓʹΑͬͯ͸ҧ͏͔΋͠Ε·ͤΜ) ͜͜ͰɺCSSͷ࡞ۀΛ΍ΊͯɺHTML͚ͩม ߋ͢Δ࡞ۀͷྲྀΕʹ໭Γ·͠ΐ͏ɻ

Slide 90

Slide 90 text

git checkout master

Slide 91

Slide 91 text

masterϒϥϯνͰ͸ɺ࠷ޙͷίϛοτ͕·ͩ H1 HENKOU ͷ··Ͱ͢ɻͭ·Γ...

Slide 92

Slide 92 text

΋ͱͲ͓Γ

Slide 93

Slide 93 text

Կࣄ΋ͳ͔ͬͨ ͔ͷΑ͏ʹ index.html Λॻ͖׵͑ͯ...

Slide 94

Slide 94 text

commit → log

Slide 95

Slide 95 text

H1 HENKOU → KIJI MIDASI ͱ͍͏ྲྀΕͰ ίϛοτ͕ͭͳ͕Γ·ͨ͠ɻ masterϒϥϯνͰ͸ɺCSSؔ܎ͷίϛοτ͕ ͳ͔ͬͨ͜ͱʹͳ͍ͬͯ·͢ɻ

Slide 96

Slide 96 text

ผϑΥϧμ࡞ۀͷΠϝʔδ master css-coding

Slide 97

Slide 97 text

branchͱ͸ git branch css-coding css-coding

Slide 98

Slide 98 text

checkoutͱ͸ master git checkout master ࡞ۀϑΥϧμ

Slide 99

Slide 99 text

git log --oneline --graph --all

Slide 100

Slide 100 text

͔ͨ͠ʹίϛοτͷཤྺ͕෼ذ͍ͯ͠·͢ɻ ϒϥϯν͸ผͷਓͱ࡞ۀ͢Δͱ͖༗ޮͰ͢ɻଞͷόʔδϣ ϯ؅ཧπʔϧͱGit͕ҧ͏ͷ͸ɺλάͳΜ͔ΑΓͣͬͱϒ ϥϯνͷ΄͏͕࢖༻ස౓ߴ͍ͱ͍͏఺Ͱ͢ɻ Ͱ΋ͪΐͬͱ೉͍͠ͷͰɺޓ͍ʹಉ࣌ʹ৮Βͳ͍Α͏੠ Λ͔͚ͳ͕ΒͻͱͭͷϒϥϯνͰ΍ͬͯ΋͍͍Ͱ͢ɻ ͨͩ͠ɺ͜ͷʮίϛοτͷ෼ذʯͱ͍͏֓೦͸ɺGitΛཧ ղͯ͠࢖͏্Ͱઈରʹ๨Εͯ͸͍͚·ͤΜɻ

Slide 101

Slide 101 text

git merge -m “...” css-coding

Slide 102

Slide 102 text

ͨͬͨͻͱͭͷίϚϯυͰ ผͷϒϥϯνͷ࡞ۀ͕߹ମ!

Slide 103

Slide 103 text

mergeͱ͸ master css-coding git merge

Slide 104

Slide 104 text

Ϛʔδ͸ɺ૬खͷϒϥϯν͔ΒมߋϑΝΠϧ ͚ͩΛऔΓग़ͯ͠ɺࣗ෼ͷϑΝΠϧΛ্ॻ͖ ͢ΔΠϝʔδɻ ΋͠ϒϥϯνؒͰಉ͡ϑΝΠϧΛมߋͯͨ͠ ΒɺͦΕΒ͕ڝ߹(ίϯϑϦΫτ)ͨ͠ঢ়ଶʹ ͳΓ·͢ɻ

Slide 105

Slide 105 text

͍·ίϯϑϦΫτʹ͍ͭͯઆ໌͢Δͷ͸େม ͳͷͰɺͳΔ΂͘ى͜͞ͳ͍Α͏ʹͯͩ͘͠ ͍͞ɻ GitͰίϯϑϦΫτΛղফ͢Δͷ͸ɺ SubversionΑΓͣͬͱ؆୯ͳͷͰ҆͝৺Λɻ ΋͠ىͬͨ͜Βܦݧऀʹฉ͖·͠ΐ͏ɻ

Slide 106

Slide 106 text

ࢀߟ: ௒Θ͔Γ΍͍͢ϒϥϯνͷ࿩ http://www.slideshare.net/ kotas/git-15276118

Slide 107

Slide 107 text

͜͜·Ͱͷ·ͱΊ git branch ϒϥϯν໊ git checkout ϒϥϯν໊ git branch git log --oneline --graph --all git merge ϒϥϯν໊

Slide 108

Slide 108 text

Ή͔͍ͣ͠ͻͱʔ

Slide 109

Slide 109 text

ͦΖͦΖ·ͨ༊͠੒෼

Slide 110

Slide 110 text

͍͍ͪͪίϚϯυଧͭͷ͸ ਖ਼௚͠ΜͲ͍

Slide 111

Slide 111 text

http://gitx.frim.nl/

Slide 112

Slide 112 text

͋͑ͯ΋ͬͱ΋ݹ͍GitXΛ࢖͍·͢ɻ ͜͜·Ͱͷઆ໌ʹରԠ͢Δػೳ͔͠ͳ͍ͷ Ͱɺ͘͢͝Θ͔Γ΍͍͢ɻ ίϚϯυӡ༻ͱͷ૬ੑ͕͍͍Ͱ͢ɻ ίϚϯυ͕ۤखͳਓʹ͸ɺޙͰ΋ͬͱઌͷػ ೳ͕͋ΔπʔϧΛ঺հ͠·͢ɻ

Slide 113

Slide 113 text

log, diff, branch

Slide 114

Slide 114 text

branch -d(࡟আ), checkout

Slide 115

Slide 115 text

status, diff

Slide 116

Slide 116 text

add, checkout --(มߋΛ΍ΊΔػೳ)

Slide 117

Slide 117 text

commit + ΤσΟλ

Slide 118

Slide 118 text

͓·͚: λʔϛφϧ޷͖ͳΒ tig

Slide 119

Slide 119 text

վߦίʔυͷมߋ CRLF→LF จࣈίʔυͷมߋ SJIS→UTF-8 Πϯσϯτํ਑ͷมߋ λϒ→εϖʔε ઈର్தͰ΍ͬͯ͸͍͚ͳ͍͜ͱ

Slide 120

Slide 120 text

͜Ε΍ΔͱɺϑΝΠϧͷ͢΂ͯͷߦ͕ॻ͖׵Θͬͨͱೝࣝ͞ Ε·͢ɻ ຊདྷͷมߋҙਤ͕Θ͔Βͳ͘ͳΓ·͢ɻ ΍ΔͳΒૣ͍ஈ֊ͰɺશιʔεͷϑΥʔϚοτΛҰؾʹมߋ ͢ΔίϛοτΛ͠·͠ΐ͏ɻ ઈର్தͰ΍ͬͯ͸͍͚ͳ͍͜ͱ

Slide 121

Slide 121 text

< \ｺﾜｸﾅｲｶﾗ/

Slide 122

Slide 122 text

͍Α͍ΑGitHub΁

Slide 123

Slide 123 text

https://github.com/

Slide 124

Slide 124 text

·ͩͷਓ͸αΠϯΞοϓ

Slide 125

Slide 125 text

Welcome to social coding.

Slide 126

Slide 126 text

ެ։伴Λొ࿥ ެ։伴ೝূͱSSHͷઆ໌͸ল͖·͢ɻ ͣ͹Γɺ~/.ssh ͋Γ·͔͢? open ~/.ssh id_rsa.pub ͕͋Ε͹OKɺͦΕΛ࢖͍·͢ɻ ͳ͍ਓ͸͜ΕͰ࡞Γ·͢: ssh-keygen -t rsa -C "[email protected]" ͢Ͱʹ͍࣋ͬͯΔਓ͸ྡͷਓΛख఻ͬͯ͋͛·͠ΐ͏ɻ

Slide 127

Slide 127 text

͜͜ʹৄ͘͠ग़͍ͯ·͢: https://help.github.com/articles/ generating-ssh-keys

Slide 128

Slide 128 text

id_rsa.pub Ͱ͖ͨΒ... Ͱɺid_rsa.pubͷ಺༰Λ·Δ͝ͱίϐϖ͠·͠ΐ͏ɻ

Slide 129

Slide 129 text

ϦϙδτϦΛ࡞Ζ͏ ͜͜

Slide 130

Slide 130 text

Ͱ͖ͨ

Slide 131

Slide 131 text

͸͡Ίͯͷpush

Slide 132

Slide 132 text

⌘+R

Slide 133

Slide 133 text

git push origin master ͸originͷϦϞʔτϦ ϙδτϦʹmasterϒϥϯνΛΞοϓϩʔυ͢ ΔΠϝʔδͰ͢ɻ -u Φϓγϣϯ͸ɺҎ߱masterϒϥϯνͰ git push ͚ͩͨ͠ͱ͖ɺσϑΥϧτͰoriginʹ push͢ΔΑ͏ʹͳΔͱ͍͏ඥ෇͚ɻ

Slide 134

Slide 134 text

push push

Slide 135

Slide 135 text

ͱ͜ΖͰ͜ͷEditͬͯ?

Slide 136

Slide 136 text

ฤूͰ͖ͪΌ͏!

Slide 137

Slide 137 text

ϝοηʔδ+ίϛοτ

Slide 138

Slide 138 text

git pull

Slide 139

Slide 139 text

git pull ͸ϦϞʔτͷϦϙδτϦ͔ΒϩʔΧϧ ʹμ΢ϯϩʔυ͢ΔΠϝʔδɻ ͋ɺGitHubͷαΠτͰฤू͢Δͱɺಈ࡞֬ೝ Ͱ͖ͯͳ͍ιʔεͰίϛοτΛੵΉ͜ͱʹͳ ΔͷͰɺී௨͸μϝͰ͢Αɻ

Slide 140

Slide 140 text

pull pull

Slide 141

Slide 141 text

ϦϞʔτ͔Βpull͢Δ=μ΢ϯϩʔυͨ͠΋ͷΛແ໊ϒϥϯνͱ Έͳͯ͠ɺϚʔδ→ίϛοτΛ΍͍ͬͯΔɻ μ΢ϯϩʔυͯ͠Ϛʔδ͠ͳ͍pullΛfetchͱݴ͏ɻ pull = fetch + merge ͱʹ͔͘ɺ͍͖ͳΓϩʔΧϧͥΜͿ্ॻ͖Ͱ͸ͳ͍ɻ FTPͰམͱ͖ͯͨ͠ϑΝΠϧΛ͍͖ͳΓ্ॻ͖ͯ͠ࠔͬͨ͜ͱ... ͋Γ·͢ΑͶɻ pullͷ஫ҙ఺

Slide 142

Slide 142 text

ϦϞʔτͷ࠷৽ΑΓݹ͍ঢ়گʹੵΜͩίϛοτΛpush͢Δͷ ͸ېࢭ͞Ε·͢ɻ ͳͷͰɺ·ͣϩʔΧϧʹpull͔ͯ͠Βɺ࡞ۀ→ίϛοτ →pushͷॱংΛकΓ·͠ΐ͏ɻ ଞͷਓ্͕͛ͨαʔόͷ࠷৽Λݹ͍ϑΝΠϧͰFTP্ॻ͖͠ ͯࠔͬͨ͜ͱ...͋Γ·͢ΑͶɻ pushͷ஫ҙ఺

Slide 143

Slide 143 text

΍΍͍͜͠ͷͰɺͱΓ͋͑ͣWeb੍࡞ͷݴ༿Ͱ͍͏ͱɺαʔ ό΁ͷΞοϓϩʔυͱαʔό͔Βͷμ΢ϯϩʔυͰOKͰ͢ɻ ͨͩɺಥવͷ্ॻ͖Ͱେࣦഊ͠ͳ͍૷ஔ͕෇͍ͯΔͱ͍͏͜ ͱ͚ͩཧղ͍ͯͩ͘͠͞ɻ GitͰΤϥʔʹͳΔͱ͍͏ͱ͖͸ɺ΋ͦ͜͠Ͱࣦഊ͕ى͖ͳ͔ ͬͨΒɺ΋ͬͱͻͲ͍͜ͱ͕ى͍ͬͯͨ͜ɺͱ͍͏ՄೳੑΛ ๷͍Ͱ͘Ε͍ͯΔͱࢥ͍·͠ΐ͏ɻ Ή͔͍ͣ͠ͻͱʔ

Slide 144

Slide 144 text

ͱ͜ΖͰ͖ͬ͞ɺoriginʹʮmasterΛʯpush ͨ͠ͱݴ͍·ͨ͠ɻ

Slide 145

Slide 145 text

ͭ·Γ...GitHubʹ͸·ͩ css-coding ϒϥϯν ͕ͳ͍!!

Slide 146

Slide 146 text

git push origin css-coding

Slide 147

Slide 147 text

ϒϥϯν΋pushͰ͖ͨ

Slide 148

Slide 148 text

pushͱpull͸ϒϥϯν͝ͱʹݸผͰ͢ɻ ͲΕΛpush/pull͢Δ͔Λҙࣝ͠·͠ΐ͏ɻ ݸผ͔ͩΒͱ͍ͬͯ༰ྔ͕ഒʹͳΔΘ͚Ͱ͸͋Γ·ͤ Μɻফඅ͢Δͷ͸ࠩ෼ͷྔ͚ͩͰ͢ɻ

Slide 149

Slide 149 text

ϩʔΧϧͷ࡞ۀσΟϨΫτϦΛ࡟আͯ͠΋ฏؾɻ ͜ΕͰαʔόʹશ෦͋ΔͷͰ

Slide 150

Slide 150 text

GitHubͷ͔͜͜Β

Slide 151

Slide 151 text

git clone ...

Slide 152

Slide 152 text

·͋ɺclone ͢Δͷ͸͍͍ͩͨଞਓͰ͢ɻ ్த͔Β࡞ۀʹࢀՃ͢Δਓ͸ɺgit init Ͱ͸ͳ ͘͜ͷ git clone ͔Βελʔτ͠·͢ɻ ͋ͱͰଞͷਓͱڞಉ࡞ۀͷ࿅श͠·͠ΐ͏ɻ

Slide 153

Slide 153 text

෮ݩͰ͖·ͨ͠

Slide 154

Slide 154 text

͍΍ʙΑ͔ͬͨΑ͔ͬ...

Slide 155

Slide 155 text

͓΍? img

Slide 156

Slide 156 text

஫: ۭϑΥϧμ͸μϝ Git͸ۭͷϑΥϧμΛ؅ཧͰ͖·ͤΜɻ͋͘·ͰϑΝΠϧͷมߋ ͷ؅ཧͳͷͰɻ ۭͬΆͷϑΥϧμΛҡ͍࣋ͨ͠৔߹ɺதʹԿ͔μϛʔͷϑΝΠ ϧΛೖΕ͍ͯͩ͘͞ɻ μϛʔϑΝΠϧ໊͸ empty, .gitkeep, .gitignore, .htaccess ͳͲ͍ Ζ͍Ζͳश׳͕͋Γ·͢ɻ ͋·Γ৺഑͠ͳͯ͘΋࣮֐͕͋Δ͜ͱ͸·ΕͰ͢ɻ

Slide 157

Slide 157 text

ͪͳΈʹmasterҎ֎ͷϦϞʔτϒϥϯνΛ ϩʔΧϧʹ࿈Εͯ͘ΔͳΒ... git branch css-coding origin/css-coding

Slide 158

Slide 158 text

͜͜·Ͱͷ·ͱΊ git remote add ϦϙδτϦ໊ ΞυϨε git push -u ϦϙδτϦ໊ ϒϥϯν໊ git push (஫:ϒϥϯν͝ͱ) git pull git clone ΞυϨε ۭͷϑΥϧμ͸ແࢹ͞ΕΔ git branch ϒϥϯν໊ origin/ϒϥϯν໊

Slide 159

Slide 159 text

༊͠(ry

Slide 160

Slide 160 text

͓଴ͨͤ͠·ͨ͠ GUIͰ͢Α

Slide 161

Slide 161 text

http://rowanj.github.com/gitx/

Slide 162

Slide 162 text

GitXͷ͍͢͝൛

Slide 163

Slide 163 text

clone

Slide 164

Slide 164 text

remote/fetch/pull/push

Slide 165

Slide 165 text

͜Μͳ͜ͱ·Ͱ git branch css-... origin/css-...

Slide 166

Slide 166 text

GitX͸gitίϚϯυʹ஧࣮ͳUIͳͷͰɺίϚϯ υͰཧղͨ͠ਓ͕࢖͍΍͍͢Ͱ͢ɻ ͜ͷUIࣗମ͕ʮGitͰͰ͖Δ͜ͱू(؆қ൛)ʯ ͋Γ͕ͪͳૢ࡞͕ͻͱͱ͓Γ͋ΔͷͰɺ͞Β ʹษڧ͢ΔϙΠϯτ͕ݟ͖͑ͯ·͢ɻ

Slide 167

Slide 167 text

·ͩ͜Ε͡Ό࢖͍ʹ͍͘ ͱࢥͬͨΒɺϝΠϯͰ࢖ ͏πʔϧ͸΋ͬͱࣗ෼ʹ ߹͏ͷΛબͼ·͠ΐ͏ɻ

Slide 168

Slide 168 text

͜ΕͰΑ͏΍͘ ελʔτϥΠϯ

Slide 169

Slide 169 text

Ή͔͍ͣ͠ͻͱʔ

Slide 170

Slide 170 text

gitͷίϚϯυ Ή͔͍ͣ͠ͷ͸ʙ

Slide 171

Slide 171 text

No content

Slide 172

Slide 172 text

gitͷίϚϯυମܥ͸ʮ࢖͏ਓͷؾ࣋ͪʯͰ͸ ͳ͘ʮ಺෦ઃܭͷࣄ৘ʯͰͰ͖͍ͯ·͢ɻ ࡞ͬͨਓͷؾ࣋ͪʹͳͬͨΒཧղͰ͖Δͱ͔ ແཧήʔɻ ͳͷͰ...

Slide 173

Slide 173 text

ࡉ͔͍ૢ࡞ํ๏͸๨Εͯ΋͔·͍·ͤΜɻ ༻ޠͱ֓೦ͱ࢓૊ΈͷجຊΛ๨Εͳ͍͜ͱ͕ॏཁͰ͢ɻ ཧղͯ͠͠·͑͹ɺGUIΛ࢖ͬͨ΄͏͕ޮ཰తͰ͢ɻ ίϚϯυΛ஌ΔͱɺGUIͷઆ໌ςΩετ͕ίϚϯυΦϓγϣ ϯͷԿΛࢦ͢ͷ͔ɺ૝૾Ͱ͖ΔΑ͏ʹͳΓ·͢ɻ ͔ͩΒͦ͜

Slide 174

Slide 174 text

ͨͩ͠... ຊ౰ʹࠔͬͨͱ͖͸άάͬͯίϚϯυΛίϐϖͰ͖ΔΑ͏ʹ ͠ͱ͖·͠ΐ͏ɻ GUIͷૢ࡞खॱ͸ٕज़ϒϩάʹॻ͔Εʹ͍͘ɻ git͸άάΕΔ! ←͜͜ॏཁ

Slide 175

Slide 175 text

͓ർΕ༷Ͱͨ͠