Share
Embed
第2回 Git講座
あくあたん工房での第2回 Git講座の講義資料です。gitignore
やrebaseの話、およびブランチ管理とGit GUIクライアントの話をします。
Pudding
April 02, 2018
Transcript
52 slides
-
࣍ (JUͷ࢝Ίํ GPSLͱϦϞʔτϒϥϯν HJUJHOPSF Ὂ ԋश
ϒϥϯνͷ໋໊نଇ ίϯϑϦΫτͷղফ Ὂ ԋश ࡞ۀϒϥϯν͕ϚʔδઌͷDPNNJU ͔ΒΕͯ͠·ͬͨͱ͖ͷରԠ (JU(6*ΫϥΠΞϯτ -
˔ ΧϨϯτσΟϨΫτΛ(JUͰཧ͢ΔͨΊʹ࠷ॳʹ ࣮ߦ͢ΔίϚϯυ ˔ ͜ͷૢ࡞ʹΑͬͯΧϨϯτσΟϨΫτϦҎԼʹHJU σΟϨΫτϦ͕ੜ͞ΕΔ init $ cd /path/to/your_project
$ git init $ ls -a | grep .git .git -
˔ HJUͷϦϞʔτϦϙδτϦʹؔ͢Δ ίϚϯυ ˔ ॳճࣄલʹ࡞͓͍ͯͨ͠ϦϞʔτ ϦϙδτϦΛՃ͢ΔͨΊʹ༻͢Δ ˔ ZPVQSPKFDUHJUˠ͖ʹಡΈସ͑ͯ remote $
git remote add origin https://github.com/you/ project.git $ git remote -v origin https://github.com/you/project (fetch) origin https://github.com/you/project (push) -
lPSJHJOzͬͯͳʹʁ ˔ ϦϞʔτϦϙδτϦʹผ໊Λ͚Δ͜ͱ͕Ͱ͖ɺ ಉ࣌ʹෳͷϦϞʔτϦϙδτϦΛѻ͑Δ ˔ ʮϦϞʔτϒϥϯνʯͱ͍͏ͷ͕ଘࡏ͠ɺ ͜ͷͱ͖ͷϦϞʔτͷ໊લʹ্هͷผ໊͕༻͞ΕΔ $ git branch
--all dev * master remotes/origin/HEAD -> origin/master remotes/origin/dev remotes/origin/master -
GPSL ˔ (JUIVCˠ(JUIVC#JUCVDLFUˠ#JUCVDLFUͷGPSLͰ͖ Δ͕ɺ(JUIVCˠ#JUCVDLFUͦͷٯग़དྷͳ͍ ˔ DMPOFͯ͠ϦϞʔτ63-Λॻ͖͑Δ͜ͱͰ͍ۙ͜ͱ ग़དྷΔ ! UPPUTVJUFNBTUPEPO !
ZPVNBTUPEPO QVTI QVTI º 1VMM 3FRVFTU DMPOF DMPOF ˠͨͩ͠1VMM3FRVFTU͕ૹΕͳ͍ -
GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH $ git remote add
upstream https://github.com/tootsuite/ mastodon $ git remote -v | grep upstream upstream https://github.com/tootsuite/mastodon (fetch) upstream https://github.com/tootsuite/mastodon (push) ϦϞʔτ63-Λొ ʢVQTUSFBNʣ l5PPUzl5XFFUz -
GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH $ git fetch upstream
$ git branch --all | grep upstream remotes/upstream/dev remotes/upstream/master ϦϞʔτϒϥϯνΛ GFUDI l5PPUzl5XFFUz -
GPSLݩͷมߋΛऔΓࠐΉ ! UPPUTVJUFNBTUPEPO ! ZPVNBTUPEPO 'JYCVH ϦϞʔτϒϥϯνΛ ϩʔΧϧϒϥϯνʹϚʔδ $ git
merge upstream master $ git log --pretty=format:”%h: %s” -2 4c0be41: Fix bug 17ceae2: “Toot” -> “Tweet” l5PPUzl5XFFUz -
ϒϥϯν·ͱΊ ! ZPVNBTUPEPO NBTUFS EFW NBTUFS EFW ! UPPUTVJUFNBTUPEPO NBTUFS
EFW ϩʔΧϧ ϦϙδτϦ ϦϞʔτ ϦϙδτϦ ϦϞʔτϒϥϯν ϩʔΧϧϒϥϯν SFNPUFTPSJHJONBTUFS SFNPUFTPSJHJOEFW SFNPUFTVQTUSFBNNBTUFS SFNPUFTVQTUSFBNEFW ϦϞʔτϒϥϯν GFUDI GFUDI QVTI PSJHJO VQTUSFBN NFSHF -
5JQTlVzΦϓγϣϯ ˔ HJUIVCͰϦϙδτϦΛ࡞Δͱग़ͯ͘Δɺ࠷ॳʹ࣮ߦ ͢ΔίϚϯυू Ὂ HJUJOJUHJUSFNPUFBEEPSJHJOIUUQTHJUIVCʜ Ὂ HJUBEEHJUDPNNJUNbJOJU` Ὂ HJUQVTIVPSJHJONBTUFS
˔ lVzϩʔΧϧϒϥϯνʹରͯ͠σϑΥϧτͷ ϦϞʔτϒϥϯνΛઃఆ͢ΔΦϓγϣϯ Ὂ Ҿແ͠ͰQVMMGFUDIͨ͠ͱ͖ͷऔಘઌΛઃఆ͢Δ -
HJUཧͯ͠ཉ͘͠ͳ͍ϑΝΠϧ ˔ ϦϙδτϦʹͲ͏ͯ͠HJUͰཧͯ͠ཉ͘͠ͳ͍ ͷ͕ೖΓࠐΉ͜ͱ͕͋Δ Ὂ QZUIPOͷԾڥʢWFOWʣ Ὂ TRMJUFͷσʔλϕʔεϑΝΠϧ Ὂ ίϯύΠϧͯ͠ग़དྷͨόΠφϦ
Ὂ FOWϑΝΠϧͳͲൿີͷใ͕ೖͬͨϑΝΠϧ ˔ BEE͠ͳ͚ΕDPNNJU͞ΕΔ͜ͱͳ͍͕ʜ Ὂ खಈཧϛε͕ى͖͘͢ɺྑ͘ͳ͍ -
HJUJHOPSFϑΝΠϧ ˔ HJUཧͨ͘͠ͳ͍ϑΝΠϧσΟϨΫτϦͷϦετ ˔ HJUཧԼͷϦϙδτϦͷϧʔτʹஔ͘ͷ͕Ұൠత ˔ ͜ͷϑΝΠϧࣗମHJUཧ͢Δ͜ͱʹҙ # Python __pycache__/
*.pyc # Database file *.sqlite # ignore secret dir src/**/secret ˔ Ͱ࢝·Δߦίϝϯτ ˔ IPHFͰ֦ுࢠIPHFͷϑΝΠϧ શͯΛࢦఆ ˔ ͰݸҎ্ͷϑΝΠϧ σΟϨΫτϦʹϚον Ὂ TSDTFDSFU TSDIPHFTFDSFUʹϚον -
طʹDPNNJUࡁΈͷϑΝΠϧΛແࢹ ˔ ޙ͔Βແࢹͨ͘͠ͳΔ͜ͱͨ·ʹ͋Δ ˔ ͨͩ͠ɺ͜ΕΛ࣮ߦͯ͠աڈͷDPNNJU͕ফ͑ΔΘ ͚Ͱͳ͍ͷͰɺύεϫʔυͳͲΛQVTIͯ͠͠·ͬ ͨΒϦϙδτϦ͝ͱ࡞Γͨ͠ํ͕ૣ͍ # --cachedΦϓγϣϯΛ͚ΔͱͦͷϑΝΠϧΛআͤͣ͢ $
git rm --cached want_to_delete.py # ඞͣ.gitignoreه͓ͯ͘͠ $ echo want_to_delete.py >> .gitignore -
ԋश ࣗͷ$*4ΞΧϯτͷ*%ͱύεϫʔυ͕ॻ͖ࠐ·Εͨ ϑΝΠϧʢTFDSFUUYUʣΛ࡞͢Δ HJUTUBUVTίϚϯυΛୟ͍ͯ6OUSBDLFEʹͳ͍ͬͯΔ͜ͱ Λ֬ೝ HJUJHOPSFΛॻ͍ͯHJUBEEBMM
HJUTUBUVTίϚϯυΛୟ͖ɺ·ͩTFDSFUUYU͕දࣔ͞Εͨ ਓͷΞΧϯτʹϩάΠϯͯ͠ΈΜͳͰΛݟΔ -
5JQTͱ͋ΔϑΝΠϧҎ֎શͯΛJHOPSF ˔ ͋ΔσΟϨΫτϦҎԼʹෳͷϑΝΠϧ͕֨ೲ͞Εͯ ͍Δ͕ɺͭΛআ͍ͯHJUཧͨ͘͠ͳ͍߹ ˔ ઌ಄ʹzzΛ͚ͨϑΝΠϧσΟϨΫτϦJHOPSF͢ Δର͔Βআ֎͞ΕΔʢʹHJUͰཧ͞ΕΔʣ ˔ ͜ΕΛར༻ۭͯ͠ͷσΟϨΫτϦΛHJUͰཧͰ͖Δ #
data/ҎԼͷϑΝΠϧΛશͯແࢹ data/* # data/.gitignore͚ͩແࢹ͠ͳ͍ !data/.gitignore data/ !data/.gitignore Ͱͳ͍͜ͱʹҙ -
GFBUVSFϒϥϯνͱpYϒϥϯν ˔ NBTUFS͔ΒͬͨϝΠϯͷ։ൃΛߦ͏EFWϒϥϯν ʹɺجຊతʹQVTI͠ͳ͍ ˔ ػೳ୯Ґ͝ͱʹओʹҎԼͷϒϥϯνΛͬͯӡ༻͢Δ Ὂ GFBUVSFIPHFIPHFػೳΛ։ൃ͢Δϒϥϯν Ὂ pYGVHBGVHBόάΛमਖ਼͢Δϒϥϯν
˔ ͦΕͧΕ։ൃ͕ऴΘͬͨΒEFWϒϥϯν 1VMM3FRVFTUΛग़ͯ͠Ϛʔδͯ͠Β͏ -
͋͋ͨ͘ΜͰͷϒϥϯνཧ·ͱΊ ˔ ϝΠϯͷ։ൃϒϥϯνEFWFMPQʢ·ͨEFWʣ ˔ NBTUFSʹλάΛଧͬͯϦϦʔε ˔ มߋͷ༰ʹԠͯ͡GFBUVSF ͔pY ΛΔ ˔
1VMM3FRVFTUΛൃߦͯ͠ϨϏϡʔΛड͚Δ NBTUFS pY EFWFMPQ GFBUVSF W W -
5JQT(JUIVC'MPX ˔ (JU'MPXΑΓγϯϓϧͳϑϩʔ ˔ ͭͷӡ༻ϧʔϧ NBTUFSϒϥϯνσϓϩΠՄೳ NBTUFS͔Β࡞ۀϒϥϯνΛΔ
ఆظతʹQVTI͠ɺϩʔΧϧͷόοΫΞοϓΛͱΔ ϓϧϦΫΤετͱϨϏϡʔΛ༻͍Δ 1VMM3FRVFTUΛϚʔδͨ͠ΒͪʹσϓϩΠ͢Δ ˔ EFWϒϥϯνIPUpYϒϥϯνɺSFMFBTFϒϥϯνΛ ༻ҙ͠ͳ͍ -
ίϯϑϦΫτͱ ˔ ฤूͷڝ߹ͷ͜ͱΛࢦ͢ ˔ HJUͷNFSHFૢ࡞ʹΑͬͯࣗಈతʹղফͰ͖ͳ͍มߋ ˔ Α͋͘Δޡղ Ὂ ίϯϑϦΫτΛى͜͢ͷྑ͘ͳ͍ʂ ˗
େنͳ։ൃʹͳΕආ͚ΒΕͳ͍͜ͱɻ దͳରॲΛ֮͑Δ͖ Ὂ ڧ੍తʹϚʔδ͢Εྑ͘ͳ͍ʁ ˗ ͲͪΒ͔ͷϒϥϯν͕໌֬ʹਖ਼͍͠ͳΒͦΕͰྑ͍ -
Ͳ͏͍͏ͱ͖ʹى͜Δ͔ʢҰྫʣ NBTUFS CSBODI" CSBODI# +1 branch-A UFTUUYU VQEBUFCZCSBODI" +1 branch-B
UFTUUYU VQEBUFCZCSBODI# ϑΝΠϧͷ ಉ͡ॴΛ ผͷϒϥϯν͕ มߋ͍ͯ͠Δ τϐοΫϒϥϯν -
ίϯϑϦΫτͤͯ͞ΈΔ ˔ લͷεϥΠυͱಉ͡ঢ়گΛ࠶ݱ͢Δ $ git init && touch test.txt $
git add test.txt && git commit -m ‘init’ $ git checkout -b branch-A && echo branch-A >> test.txt $ git commit -a -m ‘update by branch-A’ $ git checkout master $ git checkout -b branch-B && echo branch-B >> test.txt $ git commit -a -m ‘update by branch-B’ $ git checkout master $ git merge branch-A $ git merge branch-B Auto-merging test.txt CONFLICT (content): Merge conflict in test.txt Automatic merge failed; fix conflicts and then commit the result. ˠϚʔδޭ ˠϚʔδࣦഊ -
मਖ਼ํ๏ɿखಈϚʔδ ˔ ίϯϑϦΫτ͕ൃੜ͢Δͱɺमਖ਼͢Δ·Ͱଞͷૢ࡞͕ Ͱ͖ͳ͍ ˔ ίϯϑϦΫτͨ͠ϑΝΠϧʹϚʔΫ͕ೖΔ UFTUUYU 1 <<<<<<< HEAD
2 branch-A 3 ======= 4 branch-B 5 >>>>>>> branch-B ౷߹ϒϥϯνʢNBTUFSʣͷมߋ τϐοΫϒϥϯνʢCSBODI#ʣͷมߋ -
मਖ਼ํ๏ɿखಈϚʔδ UFTUUYU 1 <<<<<<< HEAD 2 branch-A 3 ======= 4
branch-B 5 >>>>>>> branch-B UFTUUYU 1 branch-A 2 branch-B $ git commit -a -m ‘fix conflict’ $ git log --oneline --decorate 1e55543 (HEAD -> master) fix conflict 676fa66 (branch-B) update by branch-B 3f102b2 (branch-A) update by branch-A 72e8ee4 init -
मਖ਼ํ๏ɿͲͪΒ͔ʹ߹ΘͤΔ ˔ DIFDLPVUίϚϯυΛͬͯ౷߹ϒϥϯν·ͨ τϐοΫϒϥϯνͷͲͪΒ͔ʹڧ੍తʹ߹ΘͤΔ $ git checkout --ours test.txt $
cat test.txt branch-A $ git checkout --theirs test.txt $ cat test.txt branch-B ౷߹ϒϥϯνʢࠓճNBTUFSʣʹ߹ΘͤΔ τϐοΫϒϥϯνʢࠓճCSBODI#ʣʹ߹ΘͤΔ -
मਖ਼ํ๏ɿఘΊΔʢमਖ਼ͱʜʣ ˔ ϚʔδΛࣙΊΔ͜ͱग़དྷΔ ˔ छྨͷঢ়گʹԠͯ͡ίϚϯυΛબͿ # conflictޙʹԿ͍ͯ͠ͳ͍߹ $ git merge
--abort # conflictΛमਖ਼͠Α͏ͱ৭ʑ͍ͬͨ͡ޙͷ߹ $ git reset --hard HEAD # commit·Ͱ͚ͨ͠ͲͬͺΓΊ͍ͨ߹ $ git reset --hard ORIG_HEAD -
Ϛʔδπʔϧ ˔ ڝ߹ͷϚʔΫ͚ͩோΊͯฤू͢Δͷࠎ͕ંΕΔ ˔ ֤ϒϥϯνͷϚʔδ͍ͨࠩ͠ʹͯ͘͠ΕΔΞγετπʔϧ ͕͋Δ Ὂ HJUNFSHFUPPM ˗ 7JN
&NBDT Ͱฤू Ὂ 8JO.FSHF Ὂ +FU#SBJOTͷ*%& Ὂ FUD -
˔ τϐοΫϒϥϯνʹDIFDLPVU͍ͯ͠Δঢ়ଶͰɺ౷߹ ϒϥϯνʢEFWFMPQʣΛऔΓࠐΉ rebase $ git commit -m 'commit by
topic' $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 72e8ee4 (master) init $ git rebase develop First, rewinding head to replay your work on top of it... Applying: commit by develop $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 5104883 (develop) commit by develop * 72e8ee4 (master) init -
SFCBTFͰίϯϑϦΫτ͕ى͖ͨΒ ˔ SFCBTF͕ྃ͢Δ·ͰԼهͷૢ࡞Λ܁Γฦ͢ ίϯϑϦΫτΛղফʢղফํ๏NFSHFͱҰॹʣ ղফͨ͠ΒDPOUJOVF $ git rebase
develop # ίϯϑϦΫτϝοηʔδ͍ͷͰলུ # ԿΒ͔ͷίϯϑϦΫτղফૢ࡞Λͯ͠มߋΛadd͓ͯ͘͠ $ git rebase --continue Applying: commit by develop $ git log --oneline --decorate * c98b029 (HEAD -> topic) commit by topic * 5104883 (develop) commit by develop * 72e8ee4 (master) init -
ϚʔδͰ͑͑Μ ˔ ໘ष͍͠ɼϕʔεϒϥϯνͷมߋΛ࡞ۀϒϥϯνʹ Ϛʔδ͢Ε͍͍ͷͰʁ Ὂ ϩά͕ԚΕΔ ˗ 044։ൃͰسආ͞ΕΔ Ὂ ݸਓͰΔʹશવ0,
Ὂ ͋͋ͨ͘ΜͰؾʹ͠·ͤΜ ͍͋ͭͷϚʔδίϛοτͷ ͍ͤͰϩάԚΕͪ·ͬͨͥʜ -
(6*ΫϥΠΞϯτΛ͏ͱָ ˔ ίϚϯυͷΈͩͱർΕΔ͠ϛε͕ग़͍͢ ˔ େࣄͳͷϓϩμΫτ Ὂ (JUܳਓʹͳΓ͍ͨΘ͚Ͱͳ͍ Ὂ ͪΖΜίϚϯυΛѲ͓ͯ͘͜͠ͱେ HJUCSBODIͰ
ݱࡏͷϒϥϯν Λ֬ೝʜ WJNEJ⒎Ͱมߋͨ͠ ࠩΛ֬ೝͯ͠ʜ ͋ΕɼBEEBMM ͍͍ͯ͠Μ͚ͩͬʁ ίϛοτ*% Կ͚ͩͬʁʁ -
ࣗͷؾʹೖͬͨͷΛ͓͏ ˔ ͲͷΫϥΠΞϯτҰҰ Ὂ ྉۚ Ὂ ͔ͬ͜Α͞ Ὂ ίϯϑϦΫτղফπʔϧ Ὂ
ࠩදࣔํ๏ Ὂ FUD ˔ *%&ʹඪ४ࡌ͞Ε͍ͯΔͷ͚ͩ Ͱे͑Δ -
(JU,SBLFO ˔ ྉۚϓϥϯ༗ Ὂ 'SFFඇ༻ Ὂ 1SP༻ՄɼϚʔδπʔϧ ͳͲ Ὂ &OUFSQSJTF(JU)VC
&OUFSQSJTFͱͷ࿈ܞͳͲ ˔ 8JOEPXT .BD -JOVYରԠ ˔ ͔͍͍ͬ͜ɾ(6*͕ચ࿅͞Εͯ Δ