すごいGit楽しく学ぼう

Learn You a Git for Great Good!

ͦ΋ͦ΋ɺGitͬͯ ԿͷͨΊʹ͋ΔΜͩΖ͏ʁ

Git͸ɺνʔϜͰͭͷ։ൃʹ औΓ૊Ή͜ͱΛՄೳʹ͠·͢ʂ

Git͕ແ͍ͱʜʜ Կ͕มΘ͔ͬͨ෼͔Μͳ͍ʂ ٸʹಈ͔ͳ͘ͳͬͨΜ͚ͩͲʜʜ ࠓ͔Βࢲ͕։ൃ͢ΔͷͰɺΈΜͳ։ൃΛࢭΊͯʂ ͜ͷίʔυ୭͕ॻ͍ͨΜͩΖ͏ʁ

ਖ਼௚ਏ͍ʂ

Git͕͋Ε͹ʂ ;Ή;Ήɺ͜͏͍ͬͨมߋ͕ՃΘͬͨͷ͔ʂ ಈ͔ͳ͘ͳ͚ͬͨͲɺ͙͢ʹલʹ໭ͤͨʂ ਺ඦਓͰ΋Ұॹʹ։ൃͰ͖ΔΑʂ ͜ͷΫιίʔυΛॻ͍ͨͷ͸ɺ˓˓͞Μ͔ʜʜ

ΈΜͳͰ։ൃͰָ͖͍ͯ͠ʂ ✌ Т✌ ࡾ✌ Т ✌ࡾ ✌`Т ✌

w ͱΓ͋͑ͣ࢖ͬͯΈΑ͏ʂ w ίϛοτͱϒϥϯνʹ͍ͭͯਖ਼͘͠ཧղ͠Α͏ w ྺ࢙ΛऔΓࠐΉ w མึर͍ ࠓ೔ͷ༧ఆ

࢖ͬͯΈΑ͏ʂͷͦͷલʹ $ git config --global user.name "Amy Mikushi" $ git
config --global user.email "amy@mixi.co.jp" Gitʹࣗݾ঺հ ͜͜Ͱొ࿥ͨ͠৘ใ͕(JUͷૢ࡞ʹ͍ͭͯճΔʂ

͸͡ΊͯΈΑ͏ $ mkdir books $ cd books $ git init
GitϦϙδτϦΛ࡞੒͠Α͏ ϦϙδτϦ͸ɺόʔδϣϯ؅ཧ͢ΔͨΊͷ ஷଂݿͷ͜ͱͰ͢

$ find . Α͘Ͱ͖·ͨ͠ʂ ͜ΕͰbooks

ঢ়ଶͷ֬ೝ $ git status git

ϑΝΠϧͷ௥Ճ Untracked

௥ՃΛ֬ೝ Changes

͸͡Ίͯͷίϛοτ εςʔδϯάΤϦΞʹஔ͍ͨϑΝΠϧΛεφοϓγϣο τͱͯ͠ɺGit

εςʔδϯάΤϦΞͱϦϙδτϦ Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git add ίϛοτ͢Δ४උ͕Ͱ͖ͨΒgit

Sherlock.txt Crusoe.txt ࡞ۀσΟϨΫτϦ εςʔδϯάΤϦΞ (JUϦϙδτϦ git commit add

ྺ࢙ΛΈΑ͏ มߋΛอଘͰ͖ΔΑ͏ʹͳΓ·ͨ͠ʂ มߋΛίϛοτͱͯ͠ͲΜͲΜੵΈॏͶ͍ͯ͘͜ͱ͕େࣄͰ͢ ͲΜͳมߋ͖͚ͯͨͬ͠ʜʁͱͳͬͨΒྺ࢙ΛৼΓฦΓ·͠ΐ͏ʂ $ git log աڈͷมߋ ίϛοτ ͕ҰཡͰ͖·͢
ผͷϑΝΠϧΛ௥Ճ͢ΔίϛοτΛߦ͍ɺ࠶౓

ϦϞʔτϦϙδτϦΛ࢖ͬͯΈΔ ಉ͡ঢ়ଶ͕ϦϞʔτʹ΋อଘͰ͖·͢ ͍ͭͰ΋໭ͤΔ͠ɺଞͷਓ΋Ҿͬுͬͯ͜Ε·͢ ·ͣ͸ɺGitHubͰϕΞϦϙδτϦΛ࡞੒͠Α͏ʂ https://github.com/new ϕΞϦϙδτϦ͸࡞ۀ༻σΟϨΫτϦΛ࣋ͨͳ͍ .gitͷΈͷϦϙδτϦͰ͢

ϦϞʔτϦϙδτϦΛొ࿥͢Δ ϕΞϦϙδτϦΛ࡞੒ͨ͠ΒϦϞʔτϦϙδτϦͱͯ͠ ొ࿥͠Α͏ $ git remote add origin \ git@github.com:<your
account>/books.git ొ࿥ͨ͠ϦϞʔτϦϙδτϦ͸ɺ$

खݩͷมߋΛ্͛ͯΈΑ͏ $ git push -u origin master ϦϞʔτϒϥϯνΛࣗಈͰ௥੻͢ΔΑ͏ʹઃఆ͢Δ ͔࣍Βpull

ڞಉ։ൃ͜ͱ͸͡Ί $ cd .. $ git clone git@github.com:<your account>/books.git alt_books
GitΛ࢖͏͜ͱͰෳ਺ਓͰ͔ΜͨΜʹ։ൃͰ͖·͢ʂ ࠓ͔Βผਓ ͷؾ࣋ͪ ʹͳͬͯମݧͯ͠Έ·͠ΐ͏ ·ͣ͸ϦϞʔτϦϙδτϦΛखݩʹऔΓࠐΈ·͢ alt_booksͱ͍͏໊લͰϦϙδτϦΛෳ੡(clone)Ͱ͖ ͨʂ

ڞಉ։ൃ͜ͱ͸͡Ί $ cd alt_books $ vim Crusoe.txt $ git add
Crusoe.txt $ git commit $ git push Ͱ͸ɺalt_booksͰ࡞ۀΛ͍͖ͯ͠·͠ΐ͏ pushͨ͠ΒɺGitHubͰ֬ೝͯ͠ΈΑ͏ʂ

มߋΛऔΓࠐΉ $ cd ../books $ git pull ଞਓͷߦͬͨ࡞ۀ alt_booksͰߦͬͨ࡞ۀ Λ
booksʹऔΓࠐΜͰΈ·͠ΐ͏ ͦΕʹ͸pull

มߋΛ֬ೝʂ $ vim Sherlock.txt $ git diff diff

มߋΛ֬ೝʂ1BSU $ git add Sherlock.txt $ git diff --staged ͨͩ୯ʹgit

ݩʹ໭͢ $ git reset Sherlock.txt ૉ੖Β͍͠ʂमਖ਼ՕॴΛ͙͢ʹ֬ೝ͢Δ͜ͱ͕Ͱ͖ΔΑ ͏ʹͳΓ·ͨ͠ ࣍͸ݩʹ໭͢ํ๏Λ֮͑·͠ΐ͏ addΛऔΓফ͢ʹ͸git

ݩʹ໭͢ $ vim Sherlock.txt $ git checkout -- Sherlock.txt ͜ΕͰ޷͖ͳ͚ͩBEEΛͨ͠ΓɺBEEΛऔΓফͨ͠ΓͰ
͖·͢ ࣍͸ϑΝΠϧࣗମΛલճͷίϛοτঢ়ଶʹ໭͢ํ๏Ͱ͢ ίϛοτͯ͠ͳ͍มߋ͸ফ͑ͪΌͬͯݩʹ໭ͤͳ͍ʂ

ϒϥϯνΛ࡞Ζ͏ Gitͷ࢖͍ํΛ΄ͱΜͲϚελʔ͠·ͨ͠ʂ ࠷ޙʹGitͷϒϥϯνػೳΛֶͼ·͠ΐ͏ ϒϥϯν͸ɺݱࡏͷίϐʔΛ࡞੒͢ΔػೳͰ͢ ػೳ௥Ճ΍όάमਖ਼ͷࡍ͸ϒϥϯνΛ੾ͬͯ࡞ۀΛਐΊ·͢ ੾ͬͨϒϥϯν͔Β͸͍ͭͰ΋ݩͷmasterϒϥϯνʹ໭ͬ ͯ͘Δ͜ͱ͕Ͱ͖·͢ master͸σϑΥϧτͷϒϥϯν໊Ͱ͢

ϒϥϯνΛ࡞Ζ͏ $ git branch clean_up ϒϥϯνΛ੾Δʹ͸ɺgit

ϒϥϯνΛ੾Γସ͑ͯΈΑ͏ $ git checkout clean_up clean_up

ϑΝΠϧͷ࡟আ $ git rm '*.txt' $ git commit -m "Remove
all files" clean_up

ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git checkout master clean_up

ϒϥϯνͰߦͬͨ࡞ۀΛऔΓࠐ΋͏ $ git merge clean_up clean_up

ϒϥϯνͷ࡟আ $ git branch -d clean_up ඞཁͷͳ͘ͳͬͨclean_upϒϥϯνΛ࡟আ͠Α͏ git

࠷ޙͷpush $ git push ࠷ޙʹࠓ·ͰߦͬͨมߋΛGitHubʹ΋൓өͤ͞Α͏ʂ Git͕࢖͑ΔΑ͏ʹͳͬͨʂ

ίϛοτͱϒϥϯνͬͯ Ͳ͏͍͏࢓૊ΈͳΜͩΖ͏ʁ

ίϛοτͱϒϥϯνΛཧղ͢Δ͜ͱͰ GitΛγϯϓϧʹཧղͰ͖·͢

ίϛοτͱ͸ʁ ίϛοτ͸༷ʑͳ৘ใΛ͍࣋ͬͯ·͢ w ϦϏδϣϯ w Tree

ίϛοτʹ͸਌͕͍Δ ͭલͷίϛοτͷϦϏδϣϯΛ࣋ͭͷͰίϛοτʹ͸ ਌͕͍Δʂ ৽͍͠ίϛοτ͔Βݹ͍ίϛοτ͸؆୯ʹ୧ΕΔ

࠷ݹͷίϛοτ·Ͱ୧ΕΔ ίϛοτΛ୧͍ͬͯ͘ͱඞͣҰ൪࠷ݹͷίϛοτ·Ͱ ୧Γண͚Δʂ ࠷ݹ ͋ΔͭͷίϛοτΛݟΕ͹ɺͦͷྺ࢙͕෼͔Δ

ίϛοτ͸෼͔͚ͬͨͲ ϒϥϯν͸ʁ

୯ͳΔಛఆͷίϛοτΛࢦͨ͠ ϙΠϯλͷΑ͏ͳ΋ͷͰ͢ʂ

ϒϥϯν σϑΥϧτͷϒϥϯν໊͸master ϒϥϯνͷઌ಄Λࢦ͢ϦϑΝϨϯε͸ɺ ςΩετͰϦϏδϣϯ SHA-1 ͕อଘ͞Ε͍ͯ·͢

ϒϥϯν ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ $ git branch new

ϒϥϯν $ git branch new
৽͍͠ͷ͕ग़དྷͨʂ ৽ͨͳnewͱ͍͏໊લͷϒϥϯνΛ࡞੒ͯ͠ΈΔ

ϒϥϯνͷجຊ͸͜Ε͚ͩʂ ୯ͳΔϙΠϯλͳͷͰɺϒϥϯν໊͕ ࢖͑Δॴ͸ϦϏδϣϯ͕࢖͑Δ͠ ͦͷٯ΋વΓ

ϒϥϯνͷࢬ෼͔Ε ͜ͷঢ়ଶ͔ΒOFXʹίϛοτ͍ͯ͘͠ͱʜʜ

ϒϥϯνͷࢬ෼͔Ε Μʁ

ϒϥϯνͷࢬ෼͔Ε ࢬ෼͔Εͨ͠ʂ

ϒϥϯνͷࢬ෼͔Ε newϒϥϯν͚ͩมߋ͞Ε masterϒϥϯνʹ͸Өڹ͕ͳ͍ʂ

ࢲ͸Ͳ͜ʹ͍ΔΜͰ͠ΐ͏͔ʜʜ git

HEADϦϑΝϨϯε $
git checkout master

HEADϦϑΝϨϯε HEADͷҐஔ͕੾ΓସΘͬͨʂ HEAD͕෇͍͍ͯΔϒϥϯν͸ಛघͳಈ͖Λ͢Δ ෼͔Γ΍͍͢Α͏ʹ·ͣଞʹϒϥϯνΛ੾ͬͯΈΔ
$ git branch other

HEADϦϑΝϨϯε ͜͜Ͱίϛοτͯ͠ΈΔͱʜʜ
master

HEADͰࢀর͞Ε͍ͯΔϒϥϯν͸ ίϛοτ͢ΔͨͼʹҠಈ͢Δ

ίϛοτͱϒϥϯνʹ͍ͭͯ ෼͔ͬͨʂ

ྺ࢙ΛऔΓࠐΉϚʔδͬͯ Ͳ͏͍͏࣌ʹ࢖͏ΜͩΖ͏ʁ

ΘΓͱͲ͜Ͱ΋࢖͏ʂ

ɾνʔϜͰ։ൃ͍ͯ͠Δ࣌ʹ ଞͷਓͷมߋΛऔΓࠐΉͱ͖ ɾਓͰ։ൃ͍ͯ͠Δ࣌ʹෳ਺ͷ ϒϥϯνΛͭʹ·ͱΊΔͱ͖

ΘΓͱΑ͋͘Δύλʔϯ Αʔ͠ɺमਖ਼΋ऴΘͬͨ͠αʔόʹ push

ͳͥpushͰ͖ͳ͍ʁ remote
repo my repo ͢Ͱʹ৽͍͠ ίϛοτ͕ʂ

͜ͷঢ়ଶͰ͸pushͰ͖·ͤΜ Ͳͷίϛοτ͕masterϒϥϯνͷ࠷৽͔෼͔Βͳ͘ͳ Δ͔ΒͰ͢ ҎԼͷΑ͏ͳঢ়ଶΛ࡞Δ͜ͱ͸ग़དྷ·ͤΜ

Ͳ͏ͨ͠Β͍͍ͷʁ Ұ౓खݩʹremote

มߋΛऔΓࠐΉ remote
repo my repo $ git pull origin master

remote repo my repo
มߋ͕औΓࠐ·Εͨʂ

remote repo my repo
$ git push origin master

remote repo my repo
pushͰ͖ͨʂ

ΈΜͳͰ։ൃ ͭͷϒϥϯνΛผʑʹมߋͨ࣌͠͸ɺ ଞਓͷมߋΛϚʔδͯ͠push

͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ ΘΓͱ͍Ζ͍ΖͳॴͰ࢖͏ϚʔδͰ͕͢ɺ ࣮͸͍Ζ͍Ζͳྺ࢙ͷऔΓࠐΈํ͕͋Γ·͢ʂ • merge

$
git merge topic --ff merge

தͷਓ
ʮtopicϒϥϯνͬͯmasterͷࠩ෼શ෦ ɹؚΜͰΔ͠ɺҰॹʹͪ͠Ό͑͹Α͘Ͷʁʯ merge

தͷਓ ʮϚʔδͨ͠Αʔʯ
merge

$ git merge topic --squash merge

தͷਓ ʮtopicͷมߋ಺༰Λѹॖ͠Α͏ʂʯ தͷਓʮͭͷύονʹѹॖͰ͖ͨʂʯ merge

Ϛʔδ͢Δ಺༰Λѹॖ͠ɺࠩ෼Λݱࡏͷίϛοτʹ ৐͚ͬΔʂ ࠩ෼͸εςʔδϯάΤϦΞʹ৐ͤΒΕΔ͚ͩͳͷͰɺ ίϛοτ͸ࣗ෼Ͱ΍Δඞཁ͕͋Δ merge

ϦϕʔεͬͯԿʁ ϚʔδͱԿ͕ҧ͏ͷʁ

rebase '
͜Ε͕Ϧϕʔεʂ

࣮ࡍϦϕʔε͕Ͳ͏͍͏͜ͱΛ ͢Δͷ͔ͭͣͭݟ͍ͯ͜͏

rebase topicϒϥϯνΛrebase͍ͨ͠

rebase
$ git rebase master

' rebase ·ͣίϛοτͷมߋ಺༰ΛͦΕͧΕύονʹ͢Δ

rebase topicϒϥϯνΛmasterͱ ಉ͡ҐஔʹҠಈͤ͞Δ

rebase ࡞੒͓͍ͯͨ͠ύονΛͭͣͭ ॱʹద༻ͯ͠ίϛοτ͍ͯ͘͠

rebase ࠩ෼Λద༻ͯ͠ίϛοτ

rebase '

ର৅ͷϒϥϯνͷ্ʹݱࡏͷϒϥϯνΛ࡞Γ௚͠·͢ rebaseʹΑͬͯ࡞ΒΕͨίϛοτ͸ಉ͡಺༰͚ͩͲผͷ ίϛοτʹͳΔͷͰ஫ҙͰ͢ʂ git

ผͷίϛοτʹͳΔ w ϦϏδϣϯ w Tree

΍ͬͯ͸͍͚ͳ͍rebase ίϛοτͷ৘ใ͕มΘͬͯ͠·͏ͷͰɺ طʹpush͞Ε͍ͯΔϒϥϯνΛrebaseͯ͠͸͍͚·ͤΜ ଞਓ͕push

Gitͷ৭ʑͳٕΛֶ΅͏ʂ

͜Ε͚ͩ͸֮͑Α͏ $ git

gitίϚϯυͰ͸ɺGitͷΑ͘࢖͏ίϚϯυΛҰཡ͢Δ ͜ͱ͕ग़དྷ·͢ ίϚϯυͷৄࡉͳઆ໌Λݟ͍ͨ࣌͸ɺmanΛར༻͠· ͠ΐ͏ ྫ͑͹ɺmergeίϚϯυʹ͍ͭͯৄ͘͠஌Γ͍ͨͱ͖͸ ϋΠϑϯͰܨ͛ͯೖྗ͠·͢ $ man git-merge ͜Ε͚ͩ͸֮͑Α͏

Ϛʔδ͢Δ࣌ʹ(JU͚ͩͰ͸ղܾͰ͖ͳ͍͜ͱ͕͋Γ·͢ ͦΕ͕ίϯϑϦΫτͰ͢ ίϯϑϦΫτͨ͠৔߹͸ਓ͕ؒղܾ͢Δඞཁ͕͋Γ·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ ೣ͸ղܾ͠ͳ͍

ίϯϑϦΫτͨ͠ϑΝΠϧ͸ɺboth

ίϯϑϦΫτΛमਖ਼ͯ͠ɺίϛοτ͠·͢ ίϯϑϦΫτ͸΋͏͍΍ͩ b <<<<<<< HEAD ccc ======= c >>>>>>> topic
d b ccc d ίϯϑϦΫτղܾ࣌ʹɺίϯϑϦΫτղܾҎ্ͷ͜ͱΛͯ͠͸ ͍͚·ͤΜ Ͳͷ਌ʹ΋ݱΕͳ͍มߋΛ͍ͯ͠ΔϚʔδΛevil

Φϓγϣϯͳ͠ͷgit

ͦΕʹ͸git

Ͳ͏͠Α͏΋ͳ͘ͳͬͨ ؒҧͬͯϒϥϯνΛফͯ͠͠·ͬͨ ద౰ʹreset

　ㅤ　ㅤ　ㅤ

גࣜձࣾϛΫγΟͰ΋ ΄ͱΜͲͷ෦ॺ͕࢖͍ͬͯ·͢

GitHubͷPull

ྡͷਓͷGitHubͷϓϩδΣΫτΛϑΥʔΫ͠·͢ ϑΥʔΫͨ͠ϦϙδτϦΛखݩʹΫϩʔϯ͠·͢ ࡞ۀ༻ϒϥϯνΛ࡞੒͠·͢ มߋΛՃ͑ͯίϛοτͯ͠ϓογϡ͠·͢ GitHub͔ΒPull

w (JU#PPL w ͜Θ͘ͳ͍(JU w (JUͷ࢓૊Έ ͖ͤ͜ͷٕज़೔ه w ݟ͑ͳ͍νΧϥʲ຋༁ʳ(JUΛϘτϜΞοϓ͔Βཧղ͢Δ
w $PEF4DIPPM5SZ(JU ࢀߟจݙ ΈΜͳ΋ಡΜͰΈΑ͏ʂ

すごいGit楽しく学ぼう

すごいGit楽しく学ぼう

More Decks by MIXI ENGINEERS

Other Decks in Programming

Featured

Transcript