The 7 Habits of Git

Transcript

1. Crocos, Inc. Sotaro Karasawa @sotarok http://facebook.com/sotarok (JU
   ͭͷ৺ߏ͑ #get_great_git @ (FU
   (SFBU
   (JU
   
   CZ
   2JJUB

2. ࣗݾ঺հ 4PUBSP
   ,BSBTBXB
   
   !TPUBSPL ฑ୔
   ૱ଠ࿠ IUUQRJJUBDPNTPUBSPL גࣜձࣾΫϩίε
   
   $SPDPT
   *OD 1)1 (JU 3FE
   #VMM

3.  (3&&Ͱ
   47/
   ˠ
   (JU
   ҠߦͷϓϩδΣΫτɻ։ൃϑϩʔΛ جຊ่ͣ͞
   (JU
   ͷྑ͍ॴΛ׆͔ͤΔϑϩʔ࡞Γ  HJUEBJMZ
   ϦϦʔε  $SPDPTͰ(*5-"#ಋೖ 1VMM
   3FRVFTU
   ϕʔεͷ։ൃϑϩʔ΁  (JU)VC
   

   1SJWBUF
   ʹҠߦ (JU
   ʹؔͯ͠Կ͔͍͏͜ͱ͕͋Δͱ͢Ε͹

4. ࠓ೔࿩͢͜ͱʮ৺ߏ͑ʯ ର৅ऀ (JU
   ॳʙதڃऀ 1VMM
   3FRVFTU
   ͦΖͦΖ͔ͳͷਓ

5. ଉΛٵ͏Α͏ʹ
   HJU
   TUBUVT

6. -JOVY
   Ͱ ͳΜ͔
   MT
   ͬͯଧͪ·͢ΑͶ Ջͳ࣌

7. ͦͷؾ࣋Ͱ 
   HJU
   TUBUVT

8. ͋ͱ
   EJGG 
   HJU
   EJGG 
   HJU
   EJGG
   DBDIFE

9. ͱʹ͔͘
   DPNNJU
   લʹ 
   HJU
   EJGG
   DBDIFE

10. HJU
    DPNNJU
    B
    ࢖͏ͳ ͻͱͭͻͱͭ BEE
    ͢Δͱྑ͍Ͱ͢ 47/
    ͔Βདྷͨਓ͕ Α͘΍ͬͯΔ͖͕͢Δ

11. ͳΜͳΒ
    BMJBT
    ʹ BMJBT
    HTUHJU
    TUBUVT

12. ଉΛు͘Α͏ʹ
    HJU
    CSBODI

13. 1VMM
    1VTI
    .FSHF
    3FCBTF
     ͢΂ͯͷૢ࡞Ͱ CSBODI
    Λҙࣝ͠·͠ΐ͏ʂ

14. Α͋͘Δ(JUࣄނ
    τοϓ ʮ͍͢·ͤΜɺ ɹҧ͏ϒϥϯνʹ
    QVTI
    ͪ͠Ό ͍·ͨ͠ʯ

15. ͳΜͳΒ
    BMJBT
    ʹ BMJBT
    HCHJU
    CSBODI
    B

16. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ

17. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ τϥϒΔਓ͸ ͍͍ͩͨݟͯ·ͤΜʂ ༉அې෺ʂ

18. NFSHF
    SFCBTF
    Λཧղ͢Δ

19. େࡶ೺ʹݴͬͯ Git ษڧձ@ສ༿ #3 ʹߦ͖ͬͯͨ http://gom.hatenablog.com/entry/20090522/1243011416 ૬खͷมߋΛଚॏ͠·͠ΐ͏ NFSHF
    ࣗ෼͕ओମɻࣗ෼ͷΛݩʹ૬खͷมߋΛద༻͢Δ SFCBTF
    ૬ख͕ओମɻ૬खͷΛݩʹࣗ෼ͷมߋΛద༻͢Δ

20. NFSHF
    ࣗ෼͕ओମ SFCBTF
    ૬ख͕ओମ

21. NFSHF ࣗ෼ ૬ख

22. NFSHF ࣗ෼ ૬ख ࣗ෼ͷมߋʹ૬ख ͷมߋΛ͔ͿͤΔ Πϝʔδ

23. SFCBTF ࣗ෼ ૬ख

24. SFCBTF
    Πϝʔδ ࣗ෼ ૬ख

25. SFCBTF
    Πϝʔδ ࣗ෼ ૬ख

26. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

27. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

28. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

29. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

30. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

31. SFCBTF
    Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख

32. SFNPUFϒϥϯν໊Λলུ͠ͳ͍

33. ૢ࡞͸໌ࣔతʹ 
    HJU
    QVTI
    PSJHJO
    GFBUVSFYYY

34. ͻͱͭ΋͔ܽͤ·ͤΜ 
    HJU
    TUBUVT 
    HJU
    EJGG 
    HJU
    BEE
     
    HJU
    EJGG
    DBDIFE 
    HJU
    DPNNJU 
    HJU
    QVTI
    PSJHJO
    GFBUVSFYYY

35. มߋͪ͠ΌμϝͳιϨ

36. ެ։ࡁΈͷ ྺ࢙Λ มߋͯ͠͸ ͍͚ͳ͍

37. SFCBTF SFCBTF
    ͱ͸ ྺ࢙Λ࠶ߏங͢Δ͜ͱ

38. ެ։ࡁΈͱ͸ جຊతʹ͸ HJU
    QVTI ͨ͠΋ͷ ͞Εͨ΋ͷ

39. ͦΕ͕Θ͔ͬͯͳ͍ͱ ଞਓ͕
    QVTI
    ͨ͠΋ͷΛ DMPOF
    DIFDLPVU
    ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJU
    QVMM
    SFCBTF /(

40. ·ͨ͸ ࣗ෼͕
    QVTI
    ͨ͠΋ͷ ଞͷਓ͕
    DIFDLPVU
    ͯ͠Δͷʹ HJU
    SFCBTF
     HJU
    QVTI
    PSJHJO
    G
    GFBUVSFYYYY

41. SFCBTF
    ͸ͲΜͲΜͯ͠ྑ͍͚Ͳ ศར͔ͩΒͶ commit ͷཻ౓ΛͶ ៉ྷʹͨ͠ΓͶ ͨͩ͠ɺଞͷਓͷ͜ͱΛߟ͑Δ ͜ͷ rebase ͷҙຯΛߟ͑Δ

42. ௕͍࡞ۀ͸খϚϝʹSFCBTF

43. DPOqJDU
    ͸খ͍͞΄͏͕ྑ͍ ϝΠϯͱͳΔ։ൃϒϥϯν ೔ʑ rebase ͔͚·͠ΐ͏ Ϳ͔ͭΔͳΒখ͍͞͏ͪʹʂ

44. ͖ͨͩͬ͠͞ͷ࿩ ଞਓ͕
    QVTI
    ͨ͠΋ͷΛ DMPOF
    DIFDLPVU
    ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJU
    QVMM
    SFCBTF /(

45. ·ͨ͸ merge ...

46. (JU)VCͱ1VMM
    3FRVFTU࢖͏

47. Git Λಋೖ͢Δ͜ͱ ʺ
    ϞμϯͰΠέͯΔ։ൃ

48. Git ͷಋೖ ͱ͸ ։ൃϑϩʔɾۀ຿ϑϩʔͷ ࠶ߏஙͦͷ΋ͷ

49. (JU࢖ͬͯΔͷʹ ϒϥϯν͸ͭͱ͔

50. (JU)VC͕ͦ͜ (JUΛ࢖ͬͨ։ൃʹ͓ ͚Δ࠷ྑͷπʔϧͰ ͋Δʂ ଟ෼

51. ౰࣌
    (*5-"#
    ࢖ͬͯ·͚ͨ͠ͲͶฐࣾ όʔδϣϯ͕͋Γ·ͬͯ͘·͢Ͷ ΍ΊͯΑ͔ͬͨ

52. 1VMM
    3FRVFTU ʮPull Requestʯ ͸Φʔϓϯιʔ εʹݶΒͣ࢖͑Δ༏Εͨ։ൃϑ ϩʔͩ http://d.hatena.ne.jp/sotarok/20120219/1329581585

53. 1VMM
    3FRVFTU Ͱ͖Δ͚ͩ୯ҐΛখ͘͞

54. 1VMM
    3FRVFTU େ͖͘ͳΓ͗͢Δ৔߹ τϐοΫϒϥϯν͔Β αϒτϐοΫͰϒϥϯνΛ੾Δ

55. ࠷ۙ͋ͬͨେن໛։ൃ αϒτϐοΫϒϥϯν 33 branch merges 165 commits

56. ࠷ޙʹͦͷଞͷ࿩୊

57. 1VMM
    3FRVFTU
    ຖͷ࣮ߦ؀ڥ Production = marketing.crocos.jp Pull Request #123 = pr123.dev.marketing.crocos.jp

58. 1VMM
    3FRVFTU
    ຖͷ࣮ߦ؀ڥ nginxͰ ... server_name ~^pr([^.]+).dev.([^.]+) ɹɹɹɹ\.marketing\.crocos\.jp$; set $pr_name $1; set

    $app_name $2;

59. (JU
    'MPX
    Y
    (JU)VC
    'MPX @ship @battleship

60. ଟ෼ࢀߟʹͳΔࢿྉ

61. ා͘ͳ͍(JU IUUQLPUBTIBUFOBCMPHKQFOUSZ  (JU
    #PPL IUUQHJUTDNDPNCPPLKB

62. -FBSOJOH
    (JU
    #SBODIJOH IUUQLTXEDDMFBSO(JU#SBODIJOHKB "
    TVDDFTTGVM
    (JU
    CSBODIJOH
    NPEFM
    Λ ຋༁͠·ͨ͠ IUUQLFJKJOTPOZBCBOCMPHTQPUKQ TVDDFTTGVMHJUCSBODIJOHNPEFMIUNM

63. (JU
    ΛऔΓר͘؀ڥɺ ։ൃϑϩʔͷ࿩ ૬ஊ૭ޱΛઃ͚·ͨ͠

64. SFDSVJU!DSPDPTDPKQ

65. None