Git Hands-On

Transcript

1. GMO Pepabo, Inc. Kenichi TAKAHASHI 2014/10/01 ৽ଔΤϯδχΞݚम Git Hands-On

2. ,FOJDIJ
   5",")"4)*
   IUUQTIVDSFBNOFU
   UXJUUFS
   
   !LFODIBO
   HJUIVC
   
   LFODIBO
   +PJO
   PO
   "QS
   
   
   ! (FOUPP 'VOUPP

   
   -JOVY
   5JMJOH
   8JOEPX
   .BOBHFS
   ,JOFTJT
   $POUPVSFE
   ,FZCPBSE
   !

3. $POUFOUT  αϒίϚϯυͱNBO
    ίϛοτɺϒϥϯνɺλά
    NFSHFͱSFCBTF

4. αϒίϚϯυͱNBO

5. mkdir git-hands-on cd git-hands-on git init

6. touch README.md git status

7. git add README.md

8. git status

9. git commit -m ‘initial commit’

10. man git-commit

11. &YFSDJTFT  HJU
    MPHͷNBOΛݟͯɺ࢖ͬͨ͜ͱ ͷͳ͍ΦϓγϣϯΛࢼͯ͠ΈΑ͏

12. echo ‘# Git Tutorial’ > README.md

13. git diff

14. git add -u

15. man git-add

16. git diff --staged

17. git commit -m ‘Add title’

18. git log

19. 3FDBQ  αϒίϚϯυͱNBOͷ࢖͍ํ
     εςʔδͱ͍͏֓೦

20. "EWBODFE
    &YFSDJTFT  HJU
    EJ⒎
    ŠTUBHFEΛ࣮ߦ͢Δαϒί ϚϯυɺHJU
    ETΛ࡞ͬͯΈΑ͏

21. mkdir bin ! echo "\!#/bin/sh\n\ngit diff -- staged" > bin/git-ds

    ! chmod +x bin/git-ds ! PATH=./bin:$PATH git ds

22. ίϛοτ
    ϒϥϯν
    λά

23. git log git log --oneline git log --oneline --decorate

24. man git-log

25. git tag v0.0.1

26. git log --oneline --decorate

27. git branch update-readme

28. git log --oneline --decorate

29. &YFSDJTFT  DPNNJUɺCSBODIɺUBH͸Կ͕ҧ͏ ͷ͔࿩͋ͬͯ͠ΈΑ͏

30. ޡղΛڪΕͣʹݴ͏ͱ commitͷϋογϡͷผ໊͕ ϒϥϯνɺλά

31. git log --oneline --decorate

32. HEAD͸ࠓ͍Δίϛο τΛࠩ͢ϙΠϯλ

33. git checkout (Ұͭલͷίϛοτ) git log --online --decorate

34. git checkout master git log --oneline --decorate

35. &YFSDJTFT  NBTUFSͷҰͭલͷίϛοτΛ DIFDLPVU͠ɺ3&"%.&Λमਖ਼͠ ͯίϛοτͯ͠ΈΑ͏
     ͜ͷͱ͖ɺίϛοτͷάϥϑ͕Ͳ͏ ͳ͍ͬͯΔ͔ߟ͑ͯΈΑ͏

36. git checkout HEAD~ echo 'hello antipop' >> README.md ! git

    add -u git commit -m 'Lost commit' ! git log --oneline --decorate ! git checkout master ! git log --oneline --decorate

37. 3FDBQ  ϩά͸ίϛοτͷ࿈ͳΓ
     UBH
    CSBODI͸DPNNJUͷผ໊
     )&"%͸ࠓ͍Δͱ͜ΖΛࠩ͢ϙΠϯ λ

38. "EWBODFE
    &YFSDJTF  ḷΕͳ͘ͳͬͨίϛοτΛ෮چ͢Δ ํ๏Λ஌Β΂ͯΈΑ͏

39. NFSHFͱSFCBTF

40. git checkout update-readme

41. echo 'hello hsbt' >> README.md ! git diff ! git

    add -u ! git commit -m 'Hello hsbt'

42. echo 'Konichiwa Rails' >> README.md ! git diff ! git

    add -u ! git commit -m 'Konichiwa Rails' ! git log --oneline --decorate

43. git checkout master

44. touch History.md ! git add History.md ! git commit -m

    'Create History.md’ ! git log --oneline --decorate !

45. git merge update-readme

46. &YFSDJTF
    T  NFSHFίϛοτΛΈͯίϛοτͷܨ ΓΛ૝૾ͯ͠ΈΑ͏

47. "EWBODFE
    &YFSDJTFT
     ΋͠ɺNBTUFSʹίϛοτ૿͑ͯͳ ͔ͬͨͱ͖ͷϚʔδʹ͍ͭͯௐ΂ͯ ΈΑ͏ ώϯτ
    'BTU'PSXBSE

48. git checkout -b hello-swift ! echo 'Hello Swift' > Swift.md

    ! git add Swift.md ! git commit -m 'Add Swift.md'

49. git checkout master ! echo 'Hello Android' >> README.md !

    git add -u ! git commit -m ‘Hello Android'

50. git checkout hello-swift

51. git log --oneline --decorate ! (ίϛοτΛϝϞ͓ͯ͜͠͏)

52. git rebase master

53. git log --oneline --decorate

54. &YFSDJTFT  SFCBTFʹΑͬͯίϛοτͷܨ͕Γ ͕Ͳ͏มΘͬͨͷ͔૝૾ͯ͠ΈΑ͏
     ϝϞ͓͍ͯͨ͠ίϛοτΛDIFDLPVU ͯ͠ɺHJU
    MPHΛݟͯΈΑ͏

55. 3FDBQ  HJU
    NFSHF͸ͭͷίϛοτΛ૆ઌ ʹ࣋ͭίϛοτΛ࡞Δ
     HJU
    SFCBTF͸ίϛοτ͔ΒύονΛ ࡞ͬͯɺͦΕΛҰͭͣͭ౰͍ͯͯ͘

56. "EWBODFE
    &YFSDJTFT
     NFSHFͱSFCBTFͰͦΕͧΕίϯϑ ϦΫτͷղܾํ๏ʹ͍ͭͯ࿩͋ͬͯ ΈΑ͏

57. ·ͱΊ

58. $POUFOUT  αϒίϚϯυͱNBO
     ίϛοτɺϒϥϯνɺλά
     NFSHFͱSFCBTF

59. αϒίϚϯυͱNBO  NBOͷ࢖͍ํ
     εςʔδͱ͍͏֓೦

60. ίϛοτɺϒϥϯνɺλά  ϩά͸ίϛοτͷ࿈ͳΓ
     UBH
    CSBODI͸DPNNJUͷผ໊
     )&"%͸ࠓ͍Δͱ͜ΖΛࠩ͢ϙΠϯ λ

61. NFSHFͱSFCBTF  HJU
    NFSHF͸ͭͷίϛοτΛ૆ઌ ʹ࣋ͭίϛοτΛ࡞Δ
     HJU
    SFCBTF͸ίϛοτ͔ΒύονΛ ࡞ͬͯɺͦΕΛҰͭͣͭ౰͍ͯͯ͘

62. ଓ͖͸ Pro Git http://progit-ja.github.io/

63. "OZ
    2VFTUJPOT