頻出！！知っておきたいGitコマンド

前回のGitに関するスライドの続編です。
https://speakerdeck.com/jjoo/puroguraminguwoxue-buqian-nizhi-ritaigitfalseji-ben-gai-nian-toyun-yong-huro

開発時によく使う、知っておくと便利なGitコマンドについて解説しています。

Mentaにてフロントエンドエンジニアを目指す方向けのレッスンを提供しております。
https://menta.work/plan/1608

Transcript

1. 䛂+MX䛃䝁䝬䞁䝗䠇»
   㢖ฟ䟿▱䛳䛶䛚䛝䛯䛔
   

   View Slide

2. ๓ᅇ䛾䛚䛥䜙䛔
   —+MX
   䝋䞊䝇䝁䞊䝗䛾䝞䞊䝆䝵䞁⟶⌮䝒䞊䝹
   —+MXLYF
   +MX䜢฼⏝䛧䚸⊂⮬䛾ᶵ⬟䜢ຍ䛘䛯䝩䝇䝔䜱䞁䜾䝃䞊䝡䝇
   —䝸䝫䝆䝖䝸
   䝁䞊䝗䛚䜘䜃䛭䛾ྛᕤ⛬䜢ಖᏑ䛧䛯䝕䞊䝍䝧䞊䝇䚹䝻䞊䜹䝹䝸
   䝫䝆䝖䝸䛸䝸䝰䞊䝖䝸䝫䝆䝖䝸䛻ศ䛛䜜䜛
   —䝤䝷䞁䝏
   సᴗᒚṔ䛾኱ඖ䛾ὶ䜜䛛䜙୍᫬ⓗ䛻⊂❧䠄ศᒱ䠅䛧䛶ኚ᭦స
   ᴗ䜢⾜䛖䛯䜑䛾ᶵ⬟
   

   View Slide

3. 䝥䝻䜾䝷䝮䜢᭩䛟䛺䜙
   ▱䛳䛶䛚䛟䛸౽฼䛺+MX
   

   View Slide

4. 䛺䛾䛷
   

   View Slide

5. ௒ᅇ䛿+MX䜢䜒䛳䛸౽฼䛻䛩䜛
   8MTW䜢䛤⤂௓
   

   View Slide

6. ᐇ㝿䛻䝁䝬䞁䝗䜢
   ྇䛔䛶ື䛝䜢☜ㄆ䛧䛺䛜䜙
   ㄞ䜐䛸ຠ⋡䛜Ⰻ䛔䛷䛩
   g+MXPSKC
   

   View Slide

7. ௒ᅇ䛾8MTW୍ぴ
   —ኚ᭦ᒚṔ䜢☜ㄆ䛧䛯䛔 䠖KMXPSK
   —๓䛾䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔 䠖KMXVIWIX
   —ᣦᐃ䝣䜯䜲䝹䜢๓䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔 䠖KMXGLIGOSYX
   —ᒚṔ䜢ṧ䛧䛶ᡠ䛧䛯䛔 䠖KMXVIZIVX
   —䝣䜯䜲䝹䛾ኚ᭦䜢୍᫬ᚅ㑊䛧䛯䛔 䠖KMXWXEWL
   —䝣䜯䜲䝹ኚ᭦䛾ᕪศ䜢☜ㄆ䛧䛯䛔 䠖KMXHMJJ
   —୍㒊䛾䝁䝭䝑䝖䛰䛡ྲྀ䜚㎸䜏䛯䛔 䠖KMXGLIVV]TMGO
   —୙せ䝣䜯䜲䝹䜢㝖እ䛧䛯䛔 䠖KMXMKRSVI
   

   View Slide

8. ኚ᭦ᒚṔ䜢☜ㄆ䛧䛯䛔
   KMXPSK
   

   View Slide

9. 䝁䝭䝑䝖ኚ᭦ᒚṔ䜢☜ㄆ䛧䛯䛔
   ౛
   KMXPSK
   GSQQMXJFEHFEIJHEJEHHJFF,)%("QEWXIVSVMKMRQEWXIV
   SVMKMRJIEXYVIEHHHIWGVMTXMSREFSYXKMXƼS[SVMKMRHIZIPSTJIEXYVIEHHHIWGVMTXMSREFSYXKMXƼS[
   HIZIPST
   %YXLSV8EVS7EQTPI WEQTPI$WEQTPIGSQ"
   (EXI7EX.YR
   YTHEXI6)%(1)
   GSQQMXGGHHIIIGJGJFHFG
   %YXLSV8EVS7EQTPI WEQTPI$WEQTPIGSQ"
   (EXI7EX.YR
   ƻVWXGSQQMX
   GSQQMX᫬䛾䝁䝯䞁䝖
   䝁䝭䝑䝖-(䛜ᅇฟ䛶䛝䛶
   䛔䜛䠙䛣䜜䜎䛷䛻ᅇ
   䝁䝭䝑䝖䛧䛯
   䝁䝭䝑䝖-(
   KMXPSK
   

   View Slide

10. 䝁䝭䝑䝖⾜䛷ᒚṔ⾲♧䛧䛯䛔
    KMXPSKSRIPMRI
    ౛
    KMXPSKSRIPMRI
    GSQQMXJ,)%("QEWXIVSVMKMRQEWXIVSVMKMRJIEXYVIEHHHIWGVMTXMSREFSYXKMXƼS[
    SVMKMRHIZIPSTJIEXYVIEHHHIWGVMTXMSREFSYXKMXƼS[HIZIPST YTHEXI6)%(1)
    GSQQMXGƻVWXGSQQMX
    䜸䝥䝅䝵䞁
    GSQQMX᫬䛾䝁䝯䞁䝖
    䝁䝭䝑䝖-(
    

    View Slide

11. KMXPSK䜢䜾䝷䝣䛷⾲♧䛧䛯䛔
    KMXPSKSRIPMRIKVETL
    ౛
    KMXPSKHIGSVEXISRIPMRIKVETL
    JGJGH,)%("QEWXIVSVMKMRQEWXIVSVMKMR,)%( *M\RYQFIVJSVQEXXMRKFYK
    JE1IVKIFVERGLQEWXIVSJKMXLYFGSQXSQSREM371MRM4VSNIGX
    `@
    `HF0SEHMRKTEKIGVIEXIH
    `E*M\1SHIP
    `
    FFHGI1IVKIFVERGLQEWXIVSJKMXLYFGSQXSQSREM371MRM4VSNIGX
    `@
    `EJFI'VIEXI6)%(1)QH
    `HHF9THEXINWSRTEVWIV
    `
    H%HHJIGXLHEXEJVSQ%4-
    EGƻVWXGSQQMX
    䝬䞊䝆≧ἣ䛺䛹䜒
    どぬⓗ䛻ᢕᥱ䛷䛝䜛
    

    View Slide

12. ๓䛾䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔
    KMXVIWIX
    

    View Slide

13. EHH䜢ྲྀ䜚ᾘ䛧䛯䛔
    KMXVIWIX
    ౛ EHH䛾ྲྀ䜚ᾘ䛧䠄⦅㞟ෆᐜ䛿ṧ䜛䠅
    KMXVIWIX?䝣䜯䜲䝹ྡA
    ౛ ᣦᐃ䝣䜯䜲䝹䛾EHH䛰䛡ྲྀ䜚ᾘ䛧䚸๓䛾䝁䝭䝑䝖䜎䛷ᡠ䛩
    ⦅㞟ෆᐜ䛿ᾘ䛘䜛
    䠄䝇䝔䞊䝆䞁䜾䠅
    

    View Slide

14. 䝁䝭䝑䝖䜢↓䛛䛳䛯䛣䛸䛻䛧䛯䛔
    KMXVIWIX?䝁䝭䝑䝖-(A?䝣䜯䜲䝹ྡA
    ౛ 䝤䝷䞁䝏඲యSV䝣䜯䜲䝹䜢ᣦᐃ䛧䛯䝁䝭䝑䝖䜎䛷ᡠ䛩
    KMXVIWIXLEVH?䝁䝭䝑䝖-(A
    ౛ ᑐ㇟䝁䝭䝑䝖䠇EHH䜒ྲྀ䜚ᾘ䛩
    KMXVIWIXWSJX?䝁䝭䝑䝖-(A
    ౛ ᑐ㇟䝁䝭䝑䝖䛾䜏䜢ྲྀ䜚ᾘ䛩
    䝣䜯䜲䝹ྡ䛿௵ព
    ⦅㞟ෆᐜ䛿ᾘ䛘䜛
    ┤๓䛾䝁䝭䝑䝖䛾䜏ྲྀ䜚ᾘ䛩
    ሙྜ䛿䛂,)%(B䛃䛷3/
    

    View Slide

15. KMXVIWIX
    KMXVIWIXWSJX?䝁䝭䝑䝖-(A
    ౛ ᑐ㇟䝣䜯䜲䝹䛾䝁䝭䝑䝖䛾䜏䜢ྲྀ䜚ᾘ䛩
    KMXVIWIXLEVH?䝁䝭䝑䝖-(A
    ౛ ᑐ㇟䝣䜯䜲䝹䛾䝁䝭䝑䝖䠇EHH䜒ྲྀ䜚ᾘ䛩
    ┤๓䛾䝁䝭䝑䝖䛾䜏
    ྲྀ䜚ᾘ䛩ሙྜ䛿䛂,)%(B䛃䛷3/
    KMXTYWLJ
    䛜ᚲせ䛺ሙྜ䜒
    

    View Slide

16. ᣦᐃ䝣䜯䜲䝹䛰䛡
    ๓䛾䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔
    KMXGLIGOSYX
    

    View Slide

17. ᑐ㇟䛾䝣䜯䜲䝹䛰䛡ඖ䛻ᡠ䛧䛯䛔
    KMXGLIGOSYX?䝁䝭䝑䝖-(A?䝣䜯䜲䝹ྡA
    ౛
    KMXGLIGOSYX
    䈜 ඲䛶䛾ኚ᭦ෆᐜ䜢䠄๓䛾䠅䝁䝭䝑䝖䛾≧ែ䛻ᡠ䛩
    
    䛆௵ព䛇≉ᐃ䛾䝁䝭䝑䝖䛻
    ᡠ䛧䛯䛔ሙྜ䛿䛴䛡䜛
    

    View Slide

18. KMXVIZIVX
    ᒚṔ䜢ṧ䛧䛶ྲྀ䜚ᾘ䛧䛯䛔
    

    View Slide

19. ᒚṔ䜢ṧ䛧䛶ྲྀ䜚ᾘ䛧䛯䛔
    KMXVIZIVX?䝁䝭䝑䝖-(A
    ౛ ኚ᭦䜢ᡴ䛱ᾘ䛩ĺኚ᭦䛸㏫䛾䝁䝭䝑䝖䜢⾜䛖
    KMXVIWIX䛿ྲྀ䜚ᾘ䛧 ྲྀ䜚ᾘ䛧䛯ᒚṔ䛿ᾘ䛘䜛
    KMXVIZIVX䛿ᡴ䛱ᾘ䛧 ᡴ䛱ᾘ䛧䛯ᒚṔ䜒ṧ䜛
    ĺVIZIVX䜢౑䛳䛯ሙྜ䛿䚸ᡠ䛩๓䛾グ㘓䜒ṧ䜛Ⅽ䚸
    䚷ᡴ䛱ᾘ䛧䛯ᒚṔ䛻෌ᗘᡠ䜛䛣䛸䜒ྍ⬟
    

    View Slide

20. 䝣䜯䜲䝹䛾ኚ᭦䜢
    ୍᫬ᚅ㑊䛧䛯䛔
    KMXWXEWL
    

    View Slide

21. సᴗ୰䚸ᛴ䛞䛷ู䛾
    䝤䝷䞁䝏᧯స䛜ᚲせ䛻䛺䛳䛯᫬
    䛷䜒䜎䛰䝁䝭䝑䝖䛿
    䛧䛯䛟䛺䛔䞉䞉䞉
    

    View Slide

22. 䝣䜯䜲䝹䛾ኚ᭦䜢୍᫬ᚅ㑊䛧䛯䛔
    KMXWXEWL
    ౛ ኚ᭦䜢䝁䝭䝑䝖䛫䛪䛻୍᫬㏥㑊䠄YRXVEGOIH䝣䜯䜲䝹㝖䛟䠅
    సᴗ୰䛻௚䛾䝤䝷䞁䝏䛻
    ษ䜚᭰䛘䜛ᚲせ䛜ฟ䛶䛝
    䛯᫬䛺䛹䛻౽฼
    KMXWXEWLPMWX
    ౛ ㏥㑊䛥䛫䛯ኚ᭦䛾୍ぴ⾲♧
    KMXWXEWLTST
    ౛ ㏥㑊䛥䛫䛯ኚ᭦䜢ᡠ䛧䚸㏥㑊䝸䝇䝖䛛䜙๐㝖䛩䜛
    

    View Slide

23. 䝣䜯䜲䝹ኚ᭦䛾ᕪศ䜢
    ☜ㄆ䛧䛯䛔
    KMXHMJJ
    

    View Slide

24. KMXHMJJ
    KMXHMJJ
    ౛ KMXEHH䛩䜛๓䛻ኚ᭦䛧䛯⟠ᡤ䛸䜲䞁䝕䝑䜽䝇䛸䛾ᕪศ䜢ぢ䜛
    KMXHMJJ?䝁䝭䝑䝖䐟䛾-(A?䝁䝭䝑䝖䐠䛾-(A
    ౛ 䛴䛾䝁䝭䝑䝖ྠኈ䜢ẚ㍑䛩䜛
    ?䝤䝷䞁䝏ྡA?䝤䝷䞁䝏ྡA䛷䝤䝷䞁䝏ྠኈ
    ?䝸䝰䞊䝖ྡ䠋䝤䝷䞁䝏ྡA,)%(䛺䛹䛾ẚ㍑䜒ྍ⬟
    

    View Slide

25. KMXHMJJ䛾౛
    KMXHMJJ
    GGHHIIIGJGJFHFGJFEHFEIJHEJEHHJF
    F
    HMJJKMXE6)%(1)QHF6)%(1)QH
    MRHI\IHIJEF
    E6)%(1)QH
    F6)%(1)QH
    $$$$
    KMXLYF⦎⩦⏝䛾WEQTPI䛷䛩䚹
    @2SRI[PMRIEXIRHSJƻPI
    ๓ᅇ䛾ኚ᭦䛷䛿䚸6)%(1)QH䝣䜯䜲
    䝹䛻䛂KMXLYF⦎⩦⏝䛾WEQTPI䛷
    䛩䚹䛃䛾୍ᩥ䜢᭩䛝㊊䛧䛯䛣䛸䛜䜟䛛
    䜛
    

    View Slide

26. ௚䛾䝤䝷䞁䝏䛾
    ୍㒊䛾䝁䝭䝑䝖䛰䛡
    ྲྀ䜚㎸䜏䛯䛔
    KMXGLIVV]TMGO
    

    View Slide

27. ୍㒊䛾䝁䝭䝑䝖䛰䛡ྲྀ䜚㎸䜏䛯䛔
    KMXGLIGOSYX?䝤䝷䞁䝏ྡA
    KMXGLIVV]TMGO?䝁䝭䝑䝖-(A
    ౛ ู䝤䝷䞁䝏䛾≉ᐃ䛾䝁䝭䝑䝖䛾䜏䜢ྲྀ䜚㎸䜐䠄㒊ศ䝬䞊䝆䠅
    ౛䠅ᚲせ䛸䛩䜛䝤䝷䞁䝏&䛾䝁䝭䝑䝖-(䜢☜ㄆᚋ䚸
    䝤䝷䞁䝏%䛻⛣ື䚸GLIVV]TMGO䛷ᑐ㇟䛾䝁䝭䝑䝖-(䜢ධຊ
    䝤䝷䞁䝏
    %
    䝤䝷䞁䝏
    &
    䝁䝭䝑䝖
    $
    䝁䝭䝑䝖
    %
    䝁䝭䝑䝖
    %
    䝁䝭䝑䝖
    %
    䝁䝭䝑䝖&䛾䜏䜢
    䝤䝷䞁䝏%䛻཯
    ᫎ䛥䛫䜛
    GLIVV]TMGO&
    

    View Slide

28. ୙せ䝣䜯䜲䝹䜢㝖እ䛧䛯䛔
    KMXMKRSVI
    

    View Slide

29. 䝥䝻䝆䜵䜽䝖䛾QIXE䝕䞊䝍䜔
    䝉䜻䝳䝸䝔䜱ୖඹ᭷䛧䛯䛟䛺䛔
    䝣䜯䜲䝹䛜䛒䜛ሙྜ
    

    View Slide

30. 䛂KMXMKRSVI䛃䝣䜯䜲䝹䜢సᡂ䛩䜛
    KMX⟶⌮䛧䛯䛟䛺䛔䝣䜯䜲䝹䠋䝕䜱䝺䜽䝖䝸䜢᭩䛔䛯
    䛂KMXMKRSVI䛃䜢䝽䞊䜻䞁䜾䝕䜱䝺䜽䝖䝸䛻సᡂ䛩䜛
    䛸䚸䝸䝫䝆䝖䝸䛾ಖᏑᑐ㇟䛛䜙グ㍕䝣䜯䜲䝹⩌䜢㝖
    እ䛷䛝䜛
    ĺLXXTWKMXLYFGSQKMXLYFKMXMKRSVI䛷䚸䝥䝻
    䝆䜵䜽䝖䛤䛸䛻ྜ䛳䛯KMXMKRSVI䝣䜯䜲䝹䛾ෆᐜ䜢☜
    ㄆ䛷䛝䜛
    

    View Slide

31. 䜎䛸䜑
    

    View Slide

32. ௒ᅇ䛾8MTW୍ぴ
    —ኚ᭦ᒚṔ䜢☜ㄆ䛧䛯䛔 䠖KMXPSK
    —๓䛾䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔 䠖KMXVIWIX
    —ᣦᐃ䝣䜯䜲䝹䜢๓䝁䝭䝑䝖䜎䛷ᡠ䛧䛯䛔 䠖KMXGLIGOSYX
    —ᒚṔ䜢ṧ䛧䛶ᡠ䛧䛯䛔 䠖KMXVIZIVX
    —䝣䜯䜲䝹䛾ኚ᭦䜢୍᫬ᚅ㑊䛧䛯䛔 䠖KMXWXEWL
    —䝣䜯䜲䝹ኚ᭦䛾ᕪศ䜢☜ㄆ䛧䛯䛔 䠖KMXHMJJ
    —୍㒊䛾䝁䝭䝑䝖䛰䛡ྲྀ䜚㎸䜏䛯䛔 䠖KMXGLIVV]TMGO
    —୙せ䝣䜯䜲䝹䜢㝖እ䛧䛯䛔 䠖KMXMKRSVI
    

    View Slide

33. +MX䛻ヲ䛧䛟䛺䜜䜀䛺䜛䜋䛹䚸
    䜘䜚ຠ⋡ⓗ䛻䝁䞊䝗䛜⟶⌮䛷䛝䜛
    

    View Slide

34. 䝥䝻䜾䝷䝮䜢᭩䛟䛺䜙
    ᑡ䛧䛪䛴▱㆑䜢ቑ䜔䛧䛶⾜䛣䛖
    

    View Slide

35. 䛒䜚䛜䛸䛖䛤䛦䛔䜎䛧䛯
    

    View Slide