ゼロからはじめる Git & GitHub 入門 / challecara-git-hands-on

資料内リンク

チャレキャラ公式ブログ
https://challecara.hatenablog.com/entry/2018/09/05/052526

Git ダウンロード
https://git-scm.com/downloads

GitHub
https://github.com/

Git をはじめからていねいに - ひとりでつかう - ブランチを知る
https://github.com/takanabe/introduction-to-git/blob/master/05_branch.md

Transcript

1. θϩ͔Β͸͡ΊΔ Git & GitHub ೖ໳ ۝भΞϓϦνϟϨϯδɾΩϟϥόϯ 2018
2. Git ͬͯͳΜͳΜʁ • όʔδϣϯ؅ཧγεςϜͷ1ͭ • Subversion, Mercurial, Visual SourceSafe • “෼ࢄܕ”ͷόʔδϣϯ؅ཧγεςϜ • ྫ͑͹Subversion͸"ूதܕ" • ΄ͱΜͲͷ։ൃݱ৔Ͱ࢖ΘΕΔπʔϧ
3. όʔδϣϯ؅ཧͷͳ͍ੈք
4. ͭΒ͍
5. όʔδϣϯ؅ཧɺ࢖͍͍ͨ
6. ͓͓͖͍͑ͯͨ͞༻ޠͦͷ̍ • ϦϙδτϦ • ϑΝΠϧͷঢ়ଶΛه࿥͢Δ৔ॴ • ίϛοτ • લճͷه࿥ͱࠓͷঢ়ଶͷࠩ෼Λه࿥͢Δ
7. ूதܕʢSubversionʣ ίϛοτ ίϛοτ Ξοϓσʔτ Ξοϓσʔτ ϦϙδτϦ ϦϙδτϦ͸1ͭ
8. ෼ࢄܕʢGitʣ ϓογϡ ϓογϡ ϓϧ ϓϧ ϦϞʔτϦϙδτϦ ϦϞʔτϦϙδτϦͱϩʔΧϧϦϙδτϦ ίϛοτ ίϛοτ ϩʔΧϧ ϦϙδτϦ ϩʔΧϧ ϦϙδτϦ
9. ͓͓͖͍͑ͯͨ͞༻ޠͦͷ̎ • ϓογϡ • ϩʔΧϧϦϙδτϦʢࣗ෼ʣͷه࿥Λ
 ϦϞʔτϦϙδτϦʹΞοϓϩʔυ͢Δ • ϓϧ • ϦϞʔτϦϙδτϦʢଞਓʣͷه࿥Λ
 ϩʔΧϧϦϙδτϦʹμ΢ϯϩʔυ͢Δ
10. ͓͓͖͍͑ͯͨ͞༻ޠͦͷ̏ • ϫʔΩϯάσΟϨΫτϦʢϫʔΫπϦʔʣ • ࡞ۀதͷσΟϨΫτϦɾϑΥϧμ • εςʔδϯάΤϦΞʢΠϯσοΫεʣ • ίϛοτ͢Δલʹొ࿥͢Δ৔ॴ • ొ࿥͞Ε͍ͯͳ͍ϑΝΠϧ͸ίϛοτෆՄ
11. ͔͜͜Β͸࣮ફ
12. ·ͣ͸ͻͱΓͰ ΍ͬͯΈΔ
13. Πϯετʔϧ • Πϯετʔϥʔͷμ΢ϯϩʔυ • https://git-scm.com/downloads • ࣗ෼ͷ؀ڥʹ߹ΘͤͨΠϯετʔϥʔΛ
 μ΢ϯϩʔυ͠·͠ΐ͏ • Πϯετʔϧ͸جຊσϑΥϧτͰਐΊͯOK • Windowsͳਓ͸࠷ޙ͚ͩʮLaunch Git Bashʯ ʹνΣοΫ
14. gitίϚϯυΛ࢖ͬͯΈΔ • MacͳΒλʔϛφϧ, WinͳΒGit BashΛىಈ • ίϚϯυΛୟ͍ͯόʔδϣϯΛ֬ೝͯ͠ΈΔ $ git --version git version 2.17.1 ※ ઌ಄ͷ$͸ଧͨͳ͍Α
15. Ϣʔβʔ৘ใΛ֬ೝ͢Δ ઃఆ Ϣʔβʔ৘ใΛઃఆ͢Δ $ git config --global user.name "Ϣʔβʔ໊" $ git config --global user.email "ϝʔϧΞυϨε" $ git config --global user.name $ git config --global user.email
16. ϩʔΧϧϦϙδτϦͷ࡞੒ .git ͕࡞੒͞ΕΔ $ mkdir ~/Desktop/challecara-git $ cd ~/Desktop/challecara-git $ git init Initialized empty Git repository in ... $ ls -a . . .. .git ※ ͜ΕΛ࡟আ͢ΔͱGitͷ؅ཧ͔Β֎ΕΔ σεΫτοϓʹ
    ࡞ۀ༻ϑΥϧμΛ࡞Δ
17. ͸͡Ίͯͷίϛοτ • ࡞ۀϑΥϧμʹ sample.txt Λ࡞੒ $ git status On branch master No commits yet Untracked files: (use "git add <file>..." to include in what will be committed) sample.txt • git status ίϚϯυΛ࢖ͬͯΈΔ ※ εςʔδϯά͞Εͯͳ͍ঢ়ଶ த਎͸ެ։͞ΕΔͷͰɺ
    ͦͷͭ΋ΓͰ
    
18. ͸͡Ίͯͷίϛοτ εςʔδϯάͯ͠ίϛοτͰ͖ΔΑ͏ʹ͢Δ $ git add sample.txt $ git status On branch master No commits yet Changes to be committed: (use "git rm --cached <file>..." to unstage) new file: sample.txt HJU
    BEE
    ίϚϯυΛ࢖ͬͯεςʔδϯά
19. ͸͡Ίͯͷίϛοτ git commit ίϚϯυΛ࢖ͬͯ
 εςʔδϯά͞ΕͨϑΝΠϧΛίϛοτ $ git commit -m "initial commit" [master (root-commit) 2586731] initial commit 1 file changed, 1 insertion(+) create mode 100644 sample.txt ※ -m ʹଓ͚ͯίϝϯτΛॻ͘ # ※ Θ͔Γ΍͢ίϝϯτΛॻ͘ͱྑ͍ $
20. ͸͡Ίͯͷίϛοτ git status ͰϫʔΩϯάσΟϨΫτϦΛ֬ೝ $ git status On branch master nothing to commit, working tree clean ϑΝΠϧͷมߋ΋ίϛοτ࿙Ε΋ͳ͍ঢ়ଶ %
21. ͸͡Ίͯͷίϛοτ git log Ͱ͜Ε·Ͱͷίϛοτه࿥Λ֬ೝ $ git log commit 25867312eexxxxxxxxxxxxxxx (HEAD -> master) Author: Hanako Yamada <xxxxx@example.com> Date: Wed Sep 5 16:52:29 2018 +0900 initial commit ୭͕͍ͭͲΜͳฤूΛ͔ͨ͠ཤྺ͕࢒Δʂ
22. ͜͜·Ͱ͓͞Β͍ • git init : ϩʔΧϧϦϙδτϦΛ࡞੒ • git status : ϫʔΩϯάσΟϨΫτϦͷঢ়ଶ֬ೝ • git add filepath : ର৅ϑΝΠϧΛεςʔδϯά • git commit -m "comment" : ίϛοτ • git log : ͜Ε·ͰͷίϛοτϩάΛ֬ೝ
23. ͸͡ΊͯͷGitHub • GitHubΞΧ΢ϯτΛ࡞੒ • https://github.com/ Ͱ Sign up ͢Δ • ࠷ޙ͸ʮskip this stepʯͰඈ͹ͤΔ
24. ϦϞʔτϦϙδτϦͷ࡞੒ • GitHubʹϦϞʔτϦϙδτϦΛ࡞੒ • ը໘ӈ্ʮʴʯ͔ΒʮNew repositoryʯ •
25. ద౰ʹೖΕΔ ۭͰ͍͍ νΣοΫ֎ͨ͠··
    ྆ํͱ΋
    /POF
    
26. ࠓճ͸ʮ)5514ʯΛબ୒͢Δ ͜ͷ௨ΓʹίϚϯυΛୟ͘ʢϢʔβʔ໊ͱύεϫʔυೖྗʣ
27. ͸͡Ίͯͷϓογϡ $ git push -u origin master Counting objects: 3, done. Writing objects: 100% (3/3), 227 bytes | 45.00 KiB/s, done. Total 3 (delta 0), reused 0 (delta 0) To github.com:TomckySan/challecara-git.git * [new branch] master -> master Branch 'master' set up to track remote branch 'master' from 'origin'. ͜Ε·ͰͷίϛοτΛϦϞʔτϦϙδτϦ΁อଘ →ίʔυΛڞ༗͢Δ४උ͕੔ͬͨʂ㊗ git push -u origin master Λ࣮ߦ Ϣʔβʔ໊ͱύεϫʔυͷ ೖྗΛٻΊΒΕͨΒ
    (JU)VCͷ΋ͷΛೖྗ
28. ͔͜͜Β͸νʔϜͰ ΍ͬͯΈΔ
29. 2ਓʢ༨ΔͳΒ3ਓʣʹ ෼͔Ε͍ͯͩ͘͞
30. ϦϞʔτϦϙδτϦΛڞ༗͢Δ • 1ਓͷGitHubϦϙδτϦʹ΋͏1ਓΛট଴ • ট଴ϝʔϧ͕ಧ͘ͷͰϦϯΫઌʹΞΫηε
31. ϦϞʔτϦϙδτϦΛڞ༗͢Δ • ট଴͞Εͨਓ͸ͦͷϦϙδτϦΛclone
32. ϦϞʔτϦϙδτϦΛڞ༗͢Δ $ cd ~/Desktop $ git clone https://github.com/Username/xxx.git Cloning into 'xxx'... remote: Counting objects: 3, done. ... લͷεϥΠυͷ
    ੺࿮ઢ಺ͷ63- σεΫτοϓʹϦϙδτϦ͕࡞੒͞ΕΔ
33. ڞ༗ϦϙδτϦʹϓογϡ • ࡞੒͞ΕͨϩʔΧϧϦϙδτϦʹϑΝΠϧΛ࡞੒ • ֤ࣗࣗ෼ͷ໊લΛؚΊͨϑΝΠϧ໊ʹ͢Δ • ࠓճ͸౎߹্ɺଞͷਓͱಉ͡ϑΝΠϧ໊ʹͳ Βͳ͍Α͏ʹ஫ҙ ( • ֤ࣗ add, commit, push ·Ͱ΍ͬͯΈΑ͏ • push੒ޭͨ͠ʁࣦഊͨ͠ʁ
34. ϓογϡࣦഊɺɺɺʁ To https://github.com/Username/xxxxx.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/ Username/xxxxx.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push -- help' for details.
35. ϓογϡࣦഊɺɺɺʁ To https://github.com/Username/xxxxx.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://github.com/ Username/xxxxx.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push -- help' for details. ϓογϡ͢Δલʹ
    ϓϧ͠ΖͬͯݴͬͯΔʁ
36. ͸͡Ίͯͷϓϧ • ଞͷਓ͕มߋ͍ͯ͠ΔͷͰϓογϡͰ͖ͳ͍ • ϓϧͨ͋͠ͱʹϓογϡ͠Α͏ $ git pull origin master ΤσΟλ͕ىಈ͢ΔͷͰɺͦͷ··อଘɾऴྃ →Vim͕ىಈͨ͠৔߹͸ :wq ͱୟ͜͏ • ϓϧͨ͠Β૬खͷϑΝΠϧΛ֬ೝͯ͠ΈΑ͏ • git log Ͱ૬खͷίϛοτϩάΛ֬ೝ͠Α͏
37. ڞ༗Ͱ͖ͨͬΆ͍ʂ
38. ͜͜·ͰͰ͖Ε͹ ͳΜͱ͔ͳΔ ʢ͸ͣʣ
39. ͓ർΕ༷Ͱͨ͠ʂ
40. ͓·͚
41. Git Ͱ؅ཧͨ͘͠ͳ͍ϑΝΠϧΛແࢹ͢Δ .gitignore Λ࡞੒͢Δ # .gitignoreͷத਎ .DS_Store *.swp /var/logs/* /build/ /app/config/parameters.yml .gitignoreʹهड़͞ΕͨϑΝΠϧ͸ Gitͷ؅ཧ͔Β֎͞ΕΔʢadd ΍ commit Ͱ͖ͳ͍ʣ
42. มߋ಺༰Λ֬ೝ͍ͨ͠ add ͢ΔલͳΒ git diff ͰมߋՕॴ͕֬ೝͰ͖Δ $ git diff $ git diff --cached add ޙ͸ --cached Λ࢖͏ $ git diff path/to/file.txt ಛఆͷϑΝΠϧ΍σΟϨΫτϦΛࢦఆ͢Δ
43. มߋ಺༰Λ֬ೝ͍ͨ͠ มߋͷ͋ΔϑΝΠϧ໊͚ͩΛදࣔ͢Δ $ git diff --name-only $ git diff [ൺֱݩͷίϛοτID] [ൺֱઌͷίϛοτID] ಛఆͷίϛοτؒͰͷࠩ෼Λදࣔ͢Δ $ git diff HEAD^ ௚લͷίϛοτͱͷࠩ෼Λදࣔ͢Δ
44. มߋΛऔΓফ͍ͨ͠ add ͢ΔલͳΒ checkout ͰมߋΛऔΓফͤΔ $ git checkout -- sample.txt add ͨ͠ޙ, commit ͢ΔલͳΒ reset HEAD Ͱ add͢Δલʹ໭ͤΔ $ git reset HEAD sample.txt
45. ίϛοτΛऔΓফ͍ͨ͠ ίϛοτΛऔΓফͯ͠ ϑΝΠϧͷมߋ͸ҡ͍࣋ͨ͠৔߹ $ git reset --soft HEAD^ $ git reset --hard HEAD^ ίϛοτΛऔΓফͯ͠ ϑΝΠϧͷมߋͦͷ΋ͷ΋ͳ͔ͬͨ͜ͱʹ͍ͨ͠৔߹
46. ίϛοτίϝϯτΛॻ͖௚͍ͨ͠ commit --amendΛ࢖͏ $ git commit --amend -m "௚લͷίϝϯτΛॻ͖௚͢"
47. มߋΛҰ࣌తʹୀආ͍ͤͨ͞ stash Λ࢖ͬͯมߋΛऔΓফ͠ɺอ͓࣋ͯ͘͠ $ git stash # ୀආͨ͠มߋΛద༻͢Δʢ͜Ε͸ίϝϯτͳͷͰୟ͔ͳ͍Ͱʣ $ git stash apply # ୀආͨ͠มߋΛදࣔ $ git stash list # ୀආͨ͠มߋΛ࡟আ $ git stash drop ΄͔߹Θͤͯ࢖͍͍ͨίϚϯυ
48. git log ͬͯݟʹ͘͘ͳ͍Ͱ͔͢ $ git log --graph ͪΐͬͱୟ͍ͯΈͯ ͪΐͬͱ՚΍͔ʹͳΔ͔΋ $ git config --global color.ui true γϯϓϧΠζϕετ $ git log --graph --pretty=format:'%s %d'
49. git log ͬͯݟʹ͘͘ͳ͍Ͱ͔͢ $ git config --global alias.graph "log --graph --date-order --all --pretty=format:'%h %Cred%d %Cgreen%ad %Cblue%cn %Creset%s' --date=short" $ git graph ΅͘͸͜͏ͯ͠·͕͢ɺ͜͜Βล͸޷ΈͰ͢ΑͶɻ https://github.com/takanabe/introduction-to-git/ blob/master/05_branch.md
50. Ͳ͏ͯ͠΋ίϚϯυͰ΍Δͷ͕͠ΜͲ͍ • GUIπʔϧ΋ͨ͘͞Μ͋Γ·͢ • Source Tree • GitHub for Win/Mac • git-gui • TortoiseGit • ΤσΟλʹΑͬͯ͸Git࿈ܞϓϥάΠϯ͕
 ͋ͬͨΓ͠·͢
51. • ϒϥϯνͷ֓೦Λཧղ͠ɺ࢖͍͜ͳ͢ • git checkout • git branch • git merge • pull Ͱ͸ͳ͘ fetch ͱ merge Λ࢖ͬͯΈΔ • ϓϧϦΫΤετΛ஌Δ • ΑΓྑ͍Gitͷ࢖͍ํΛௐ΂໛ࡧ͢Δ νʔϜ։ൃΛΑΓԁ׈ʹਐΊΔͨΊʹ