Git workshop

Nubee Tokyo Oct. 3, 2012

Transcript

1. WorkShop server-side engineer Daichi Hirata
2. Purpose (JUʹରͯ͠ͷڞ௨ೝࣝ $PNNPO
   VOEFSTUBOEJOH
   GPS
   (JU ϊ΢ϋ΢ͷڞ༗ 4IBSJOH
   PG
   LOPXMFEHF
3. Agenda (JUͷجૅ஌ࣝ #BTJD
   LOPXMFEHF 5JQT
4. Basic knowledge
5. SVN Remote Repository Working Tree Commit / Checkout
6. Repository Working Tree .git internal Index Remote Repository stash Pull / Push Git
7. Repository Working Tree Index Component
8. Repository Working Tree Index git checkout Component ͍ͭͰ΋ϦϙδτϦ͔ΒҎલͷঢ়ଶͷ ϫʔΩϯάπϦʔΛνΣοΫΞ΢τՄೳ :PV
   DBO
   DIFDL
   PVU
   UIF
   XPSLJOH
   USFF
   GSPN
   UIF
   SFQPTJUPSZ
   BU
   BOZ
   UJNF
   PG
   UIF
   QSFWJPVT
   TUBUF
9. Repository Working Tree Index Component git checkout git add ϫʔΩϯάπϦʔͷมߋ͕Πϯ σοΫε΁ొ࿥͞ΕΔ $IBOHF
   UIF
   XPSLJOH
   USFF
   UP
   UIF
   JOEFY
   JT
   SFHJTUFSFE
10. Repository Working Tree Index Component git checkout git add ΠϯσοΫεͷมߋ͕ϦϙδτϦ ΁ίϛοτ͞ΕΔ *OEFY
    DIBOHFT
    BSF
    DPNNJUUFE
    UP
    UIF
    SFQPTJUPSZ git commit
11. Repository Working Tree Index Component stash Ұ࣌తͳมߋ΍ίϛοτͰ͖ͳ͍ มߋΛୀආͤ͞Δ &WBDVBUF
    BOE
    DPNNJU
    DIBOHFT
    UIBU
    DBO
    OPU
    CF
    B
    UFNQPSBSZ
    DIBOHF git stash
12. Commit ϑΝΠϧπϦʔ 'JMF
    USFF ෇Ճ৘ใ "EEJUJPOBM
    JOGPSNBUJPO ௚લͷίϛοτ -BTU
    DPNNJU
13. Commit ϑΝΠϧπϦʔ 'JMF
    USFF ෇Ճ৘ใ "EEJUJPOBM
    JOGPSNBUJPO ௚લͷίϛοτ -BTU
    DPNNJU
14. Commit ϑΝΠϧπϦʔ 'JMF
    USFF ෇Ճ৘ใ "EEJUJPOBM
    JOGPSNBUJPO ௚લͷίϛοτ -BTU
    DPNNJU ͲΕ͔̍ͭͰ΋ҟͳΕ͹ಉ͡ϑΝΠ ϧɺಉ͡಺༰Ͱ΋ҟͳΔίϛοτ $PNNJU
    UIF
    TBNF
    pMF
    XJUI
    EJGGFSFOU
    FWFO
    XJUI
    UIF
    TBNF
    DPOUFOU
    CVU
    EJGGFSFOU
    JG
    BOZ
    POF
15. Commit ϑΝΠϧπϦʔ 'JMF
    USFF ෇Ճ৘ใ "EEJUJPOBM
    JOGPSNBUJPO ௚લͷίϛοτ -BTU
    DPNNJU
16. ೚ҙͷίϛοτ͔Β࠷ॳͷίϛοτ
    JOJUJBM
    DPNNJU
    ͔Βͦͷίϛοτʹ ࢸΔશͯͷཤྺ͕औಘͰ͖Δ Commit )JTUPSZ
    BMM
    UIF
    XBZ
    UP
    DPNNJU
    GSPN
    UIF
    JOJUJBM
    DPNNJU
    DBO
    CF
    PCUBJOFE
    GSPN
    UIF
    pSTU
    DPNNJU
    DPNNJU
    BOZ
17. ͋Δίϛοτ ͦͷϒϥϯνͷ࠷৽ͷί ϛοτ ʹࢸΔཤྺͱকདྷ Branch )JTUPSZ
    BOE
    GVUVSF
    MFBEJOH
    UP
    UIF
    NPTU
    SFDFOU
    DPNNJU
    PO
    UIBU
    CSBODI
    DPNNJU
    UIFSF
18. Branch
19. C0 C1 C2 master hotfix Merge
20. C0 C1 C2 C3 master hotfix Merge
21. C0 C1 C2 C3 master hotfix Merge
22. C0 C1 C2 C3 master hotfix Fast foward Merge
23. C0 C1 C2 C3 master #11 C4 Merge
24. C0 C1 C2 C3 master #11 C4 Merge
25. C0 C1 C2 C3 master #11 C4 Merge
26. C0 C1 C2 C3 master #11 C4 Merge
27. C0 C1 C2 C3 master #11 C4 C5 Merge
28. C0 C1 C2 C3 master #11 C4 Rebase
29. C0 C1 C2 C3 master #11 C4 Rebase
30. C0 C1 C2 C3’ master #11 C4’ master cherry-pick Rebase
31. C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 Rebase
32. C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 Rebase
33. C0 C1 C4 C2 C3 C5 C8 C6 C7 #12 master #13 $ git rebase --onto master #12 #13 Rebase
34. Tips
35. $git stash $git bisect $git commit --amend $git rebase -i HEAD~x $git cherry-pick $git reflog tips1: Useful Commands
36. $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
37. $git stash drop stash@{x} $git stash apply [stash@{x}] $git stash pop [stash@{x}] $git stash list $git stash [save message] $ git stash
38. $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
39. $git reflog $git cherry-pick $git rebase -i HEAD~x $git bisect $git stash tips1: Useful Commands $git commit --amend
40. $git bisect start $git bisect bad $git bisect good rev $git bisect next $git bisect bad/good $git bisect reset $git bisect run <test_file> $git bisect
41. $git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect
42. $git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect
43. $git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect
44. $git reflog $git cherry-pick $git rebase -i HEAD~x $git commit --amend $git stash tips1: Useful Commands $git bisect
45. 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
46. tips2: Setting - gst
47. tips2: Setting - ignore-changes
48. tips2: Setting - prompt