The 7 Habits of Git - Speaker Deck

The 7 Habits of Git

by Sotaro Karasawa

Slide 1

Slide 1 text

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

Slide 2

Slide 2 text

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

Slide 3

Slide 3 text

(3&&Ͱ47/ˠ(JUҠߦͷϓϩδΣΫτɻ։ൃϑϩʔΛ جຊ่ͣ͞(JUͷྑ͍ॴΛ׆͔ͤΔϑϩʔ࡞Γ HJUEBJMZϦϦʔε $SPDPTͰ(*5-"#ಋೖ 1VMM3FRVFTUϕʔεͷ։ൃϑϩʔ΁ (JU)VC 1SJWBUF ʹҠߦ (JUʹؔͯ͠Կ͔͍͏͜ͱ͕͋Δͱ͢Ε͹

Slide 4

Slide 4 text

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

Slide 5

Slide 5 text

ଉΛٵ͏Α͏ʹHJUTUBUVT

Slide 6

Slide 6 text

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

Slide 7

Slide 7 text

ͦͷؾ࣋Ͱ HJUTUBUVT

Slide 8

Slide 8 text

͋ͱEJGG HJUEJGG HJUEJGGDBDIFE

Slide 9

Slide 9 text

ͱʹ͔͘DPNNJUલʹ HJUEJGGDBDIFE

Slide 10

Slide 10 text

HJUDPNNJUB࢖͏ͳ ͻͱͭͻͱͭ BEE͢Δͱྑ͍Ͱ͢ 47/͔Βདྷͨਓ͕ Α͘΍ͬͯΔ͖͕͢Δ

Slide 11

Slide 11 text

ͳΜͳΒBMJBTʹ BMJBTHTUHJUTUBUVT

Slide 12

Slide 12 text

ଉΛు͘Α͏ʹHJUCSBODI

Slide 13

Slide 13 text

1VMM1VTI.FSHF3FCBTF ͢΂ͯͷૢ࡞Ͱ CSBODIΛҙࣝ͠·͠ΐ͏ʂ

Slide 14

Slide 14 text

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

Slide 15

Slide 15 text

ͳΜͳΒBMJBTʹ BMJBTHCHJUCSBODIB

Slide 16

Slide 16 text

ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ

Slide 17

Slide 17 text

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

Slide 18

Slide 18 text

NFSHF SFCBTFΛཧղ͢Δ

Slide 19

Slide 19 text

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

Slide 20

Slide 20 text

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

Slide 21

Slide 21 text

NFSHF ࣗ෼ ૬ख

Slide 22

Slide 22 text

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

Slide 23

Slide 23 text

SFCBTF ࣗ෼ ૬ख

Slide 24

Slide 24 text

SFCBTF Πϝʔδ ࣗ෼ ૬ख

Slide 25

Slide 25 text

SFCBTF Πϝʔδ ࣗ෼ ૬ख

Slide 26

Slide 26 text

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

Slide 27

Slide 27 text

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

Slide 28

Slide 28 text

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

Slide 29

Slide 29 text

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

Slide 30

Slide 30 text

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

Slide 31

Slide 31 text

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

Slide 32

Slide 32 text

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

Slide 33

Slide 33 text

ૢ࡞͸໌ࣔతʹ HJUQVTIPSJHJOGFBUVSFYYY

Slide 34

Slide 34 text

ͻͱͭ΋͔ܽͤ·ͤΜ HJUTUBUVT HJUEJGG HJUBEE HJUEJGGDBDIFE HJUDPNNJU HJUQVTIPSJHJOGFBUVSFYYY

Slide 35

Slide 35 text

มߋͪ͠ΌμϝͳιϨ

Slide 36

Slide 36 text

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

Slide 37

Slide 37 text

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

Slide 38

Slide 38 text

ެ։ࡁΈͱ͸ جຊతʹ͸ HJUQVTI ͨ͠΋ͷ ͞Εͨ΋ͷ

Slide 39

Slide 39 text

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

Slide 40

Slide 40 text

·ͨ͸ ࣗ෼͕QVTIͨ͠΋ͷ ଞͷਓ͕DIFDLPVUͯ͠Δͷʹ HJUSFCBTF HJUQVTIPSJHJOGGFBUVSFYYYY

Slide 41

Slide 41 text

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

Slide 42

Slide 42 text

௕͍࡞ۀ͸খϚϝʹSFCBTF

Slide 43

Slide 43 text

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

Slide 44

Slide 44 text

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

Slide 45

Slide 45 text

·ͨ͸ merge ...

Slide 46

Slide 46 text

(JU)VCͱ1VMM3FRVFTU࢖͏

Slide 47

Slide 47 text

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

Slide 48

Slide 48 text

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

Slide 49

Slide 49 text

(JU࢖ͬͯΔͷʹ ϒϥϯν͸ͭͱ͔

Slide 50

Slide 50 text

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

Slide 51

Slide 51 text

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

Slide 52

Slide 52 text

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

Slide 53

Slide 53 text

1VMM3FRVFTU Ͱ͖Δ͚ͩ୯ҐΛখ͘͞

Slide 54

Slide 54 text

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

Slide 55

Slide 55 text

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

Slide 56

Slide 56 text

࠷ޙʹͦͷଞͷ࿩୊

Slide 57

Slide 57 text

1VMM3FRVFTUຖͷ࣮ߦ؀ڥ Production = marketing.crocos.jp Pull Request #123 = pr123.dev.marketing.crocos.jp

Slide 58

Slide 58 text

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

Slide 59

Slide 59 text

(JU'MPXY(JU)VC'MPX @ship @battleship

Slide 60

Slide 60 text

ଟ෼ࢀߟʹͳΔࢿྉ

Slide 61

Slide 61 text

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

Slide 62

Slide 62 text

-FBSOJOH(JU#SBODIJOH IUUQLTXEDDMFBSO(JU#SBODIJOHKB "TVDDFTTGVM(JUCSBODIJOHNPEFMΛ ຋༁͠·ͨ͠ IUUQLFJKJOTPOZBCBOCMPHTQPUKQ TVDDFTTGVMHJUCSBODIJOHNPEFMIUNM