Git workshop - Speaker Deck

Git workshop

by Daichi Hirata

Slide 1

Slide 1 text

WorkShop server-side engineer Daichi Hirata

Slide 2

Slide 2 text

Purpose (JUʹରͯ͠ͷڞ௨ೝࣝ $PNNPOVOEFSTUBOEJOHGPS(JU ϊ΢ϋ΢ͷڞ༗ 4IBSJOHPGLOPXMFEHF

Slide 3

Slide 3 text

Agenda (JUͷجૅ஌ࣝ #BTJDLOPXMFEHF 5JQT

Slide 4

Slide 4 text

Basic knowledge

Slide 5

Slide 5 text

SVN Remote Repository Working Tree Commit / Checkout

Slide 6

Slide 6 text

Repository Working Tree .git internal Index Remote Repository stash Pull / Push Git

Slide 7

Slide 7 text

Repository Working Tree Index Component

Slide 8

Slide 8 text

Repository Working Tree Index git checkout Component ͍ͭͰ΋ϦϙδτϦ͔ΒҎલͷঢ়ଶͷ ϫʔΩϯάπϦʔΛνΣοΫΞ΢τՄೳ :PVDBODIFDLPVUUIFXPSLJOHUSFFGSPNUIFSFQPTJUPSZ BUBOZUJNFPGUIFQSFWJPVTTUBUF

Slide 9

Slide 9 text

Repository Working Tree Index Component git checkout git add ϫʔΩϯάπϦʔͷมߋ͕Πϯ σοΫε΁ొ࿥͞ΕΔ $IBOHFUIFXPSLJOHUSFFUPUIFJOEFYJT SFHJTUFSFE

Slide 10

Slide 10 text

Repository Working Tree Index Component git checkout git add ΠϯσοΫεͷมߋ͕ϦϙδτϦ ΁ίϛοτ͞ΕΔ *OEFYDIBOHFTBSFDPNNJUUFEUPUIF SFQPTJUPSZ git commit

Slide 11

Slide 11 text

Repository Working Tree Index Component stash Ұ࣌తͳมߋ΍ίϛοτͰ͖ͳ͍ มߋΛୀආͤ͞Δ &WBDVBUFBOEDPNNJUDIBOHFTUIBUDBO OPUCFBUFNQPSBSZDIBOHF git stash

Slide 12

Slide 12 text

Commit ϑΝΠϧπϦʔ 'JMFUSFF ෇Ճ৘ใ "EEJUJPOBMJOGPSNBUJPO ௚લͷίϛοτ -BTUDPNNJU

Slide 13

Slide 13 text

Commit ϑΝΠϧπϦʔ 'JMFUSFF ෇Ճ৘ใ "EEJUJPOBMJOGPSNBUJPO ௚લͷίϛοτ -BTUDPNNJU

Slide 14

Slide 14 text

Commit ϑΝΠϧπϦʔ 'JMFUSFF ෇Ճ৘ใ "EEJUJPOBMJOGPSNBUJPO ௚લͷίϛοτ -BTUDPNNJU ͲΕ͔̍ͭͰ΋ҟͳΕ͹ಉ͡ϑΝΠ ϧɺಉ͡಺༰Ͱ΋ҟͳΔίϛοτ $PNNJUUIFTBNFpMFXJUIEJGGFSFOU FWFOXJUIUIFTBNFDPOUFOUCVU EJGGFSFOUJGBOZPOF

Slide 15

Slide 15 text

Commit ϑΝΠϧπϦʔ 'JMFUSFF ෇Ճ৘ใ "EEJUJPOBMJOGPSNBUJPO ௚લͷίϛοτ -BTUDPNNJU

Slide 16

Slide 16 text

೚ҙͷίϛοτ͔Β࠷ॳͷίϛοτ JOJUJBMDPNNJU ͔Βͦͷίϛοτʹ ࢸΔશͯͷཤྺ͕औಘͰ͖Δ Commit )JTUPSZBMMUIFXBZUPDPNNJUGSPNUIF JOJUJBMDPNNJU DBOCFPCUBJOFEGSPNUIF pSTUDPNNJUDPNNJUBOZ

Slide 17

Slide 17 text

͋Δίϛοτ ͦͷϒϥϯνͷ࠷৽ͷί ϛοτ ʹࢸΔཤྺͱকདྷ Branch )JTUPSZBOEGVUVSFMFBEJOHUPUIF NPTU SFDFOUDPNNJUPOUIBUCSBODI DPNNJU UIFSF

Slide 18

Slide 18 text

Branch

Slide 19

Slide 19 text

C0 C1 C2 master hotfix Merge

Slide 20

Slide 20 text

C0 C1 C2 C3 master hotfix Merge

Slide 21

Slide 21 text

C0 C1 C2 C3 master hotfix Merge

Slide 22

Slide 22 text

C0 C1 C2 C3 master hotfix Fast foward Merge

Slide 23

Slide 23 text

C0 C1 C2 C3 master #11 C4 Merge

Slide 24

Slide 24 text

C0 C1 C2 C3 master #11 C4 Merge

Slide 25

Slide 25 text

C0 C1 C2 C3 master #11 C4 Merge

Slide 26

Slide 26 text

C0 C1 C2 C3 master #11 C4 Merge

Slide 27

Slide 27 text

C0 C1 C2 C3 master #11 C4 C5 Merge

Slide 28

Slide 28 text

C0 C1 C2 C3 master #11 C4 Rebase

Slide 29

Slide 29 text

C0 C1 C2 C3 master #11 C4 Rebase

Slide 30

Slide 30 text

C0 C1 C2 C3’ master #11 C4’ master cherry-pick Rebase

Slide 31

Slide 31 text

C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 Rebase

Slide 32

Slide 32 text

C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 Rebase

Slide 33

Slide 33 text

C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 $ git rebase --onto master #12 #13 Rebase

Slide 34

Slide 34 text

Tips

Slide 35

Slide 35 text

$git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands

Slide 36

Slide 36 text

$git stash drop stash@{x} $git stash apply [stash@{x}] $git stash pop [stash@{x}] $git stash list $git stash [save message] $ git stash $git stash clear

Slide 37

Slide 37 text

$git stash drop stash@{x} $git stash apply [stash@{x}] $git stash pop [stash@{x}] $git stash list $git stash [save message] $ git stash

Slide 38

Slide 38 text

$git stash drop stash@{x} $git stash apply [stash@{x}] $git stash pop [stash@{x}] $git stash list $git stash [save message] $ git stash $git stash clear

Slide 39

Slide 39 text

$git reflog $git cherry-pick $git rebase -i HEAD~x $git bisect $git stash tips1: Useful Commands $git commit --amend

Slide 40

Slide 40 text

$git bisect start $git bisect bad $git bisect good rev $git bisect next $git bisect bad/good $git bisect reset $git bisect run $git bisect

Slide 41

Slide 41 text

$git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect

Slide 42

Slide 42 text

$git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect

Slide 43

Slide 43 text

$git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect

Slide 44

Slide 44 text

$git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect

Slide 45

Slide 45 text

tips2: Setting [color] diff = auto status = auto branch = auto ui = auto [alias] co = checkout st = status -sb wd = diff --word-diff tlog = log --graph --pretty=oneline --decorate --date=short --abbrev-commit --branches hist = log --pretty=format:\"%C(yellow)%h %C(White)%ad | %C(White)%s%d %C(Red)[%an]\" --graph --date=short [merge] tool = vimdiff [core] excludesfile = ~/.gitignore