My mental model about Git

Transcript

1. Gitʹ͍ͭͯߟ͑Δͱ͖ʹ ๻͕ߟ͑Δ͜ͱ CC 3.0 BY-SA ESM > SP > AGG

   ॾڮګհ

2. ࠓ೔ͷຊ୊͡Όͳ͍͜ͱ •ϒϥϯνઓུ •mergeͱrebaseͷҧ͍ •Subversionͱ͔CVSͱ͔ͱͷൺֱ •όʔδϣϯ؅ཧͱ͸

3. ΰʔϧ

4. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html ίϛοτΛཧղ͢Δ͜ͱ͸(JUΛཧ ղ͢Δ伴ͩɻ͋ͳͨͷ৺͕ίϛοτͷ τϙϩδΛͨͩड༰͢Δ࣌ɺϒϥϯ νɺλάɺϩʔΧϧˍϦϞʔτϦϙδ τϦ౳ͷࠞཚ͸ஔ͖ڈΓʹ͞Εɺ͋ͳ ͨ͸ӥஐ͋Δષɾϒϥϯνϯάͷ஍ฏ ΁ͱୡͨ͠ͷΛ஌ΔͩΖ͏ɻ

5. ཁ໿

6. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html ͭ·Γ(JUͰ͸ɺੈք͸γϯϓϧͳ ίϛοτΦϒδΣΫτͷू߹Ͱ͋Γɺ ͦΕͧΕͷίϛοτΦϒδΣΫτ͕ଞ ͷUSFF΍CMPCΛࢀর͢ΔUSFFΛ อ࣋͠ɺCMPCʹ͸σʔλ͕อ؅͞Ε ͍ͯΔɻ͜ΕΑΓ΋ෳࡶͳશͯ͸ɺ୯ ʹ༻ޠతͳ০Γʹ͗͢ͳ͍ɻ

7. imagine "File System" / Users moro hello.txt foo README lib

   foo.rb bin foo directory file

8. / Users moro hello.txt foo README lib foo.rb bin foo

   / Users moro hello.txt foo README lib foo.rb bin foo v1 v2

9. / Users moro hello.txt foo README lib foo.rb bin foo

   / Users moro hello.txt foo README lib foo.rb bin foo v1 v2 / Users moro hello.txt foo README lib foo.rb bin foo v3

10. •σΟϨΫτϦ •ͿΒԼ͕͍ͬͯΔϑΝΠϧ΍σΟϨΫ τϦͷ৘ใΛอ࣋͢Δ •ϑΝΠϧ •தʹ"࣮"Ͱ͋ΔσʔλΛอ࣋͢Δ

11. •commit •tree •blob

12. • commit • tree • ͿΒԼ͕͍ͬͯΔblob΍treeͷ৘ใΛ อ࣋͢Δ • blob •

    தʹ"࣮"Ͱ͋ΔσʔλΛอ࣋͢Δ

13. / Users moro hello.txt foo README lib foo.rb bin foo

    / Users moro hello.txt foo README lib foo.rb bin foo v1 v2 தͷblob΍tree͕มΘΔͱɺͦͷtree΋มΘΔ

14. / Users moro hello.txt foo README lib foo.rb bin foo

    / Users moro hello.txt foo README lib foo.rb bin foo v1 v2 தͷblob΍tree͕มΘΔͱɺͦͷtree΋มΘΔ ͱɺͦͷ਌ͷtree΋มΘΔ

15. / Users moro hello.txt foo README lib foo.rb bin foo

    / Users moro hello.txt foo README lib foo.rb bin foo v1 v2 / Users moro hello.txt foo README lib foo.rb bin foo v3

16. •tree ͕Θ͔Ε͹ؚ·ΕΔtreeͱblob͕ Θ͔Δ •೚ҙͷόʔδϣϯΛ෮ݩͰ͖Δ •ࠜͬ͜(root)ͷtree͕Θ͔Ε͹Ұࣜ෮ ݩͰ͖Δ

17. $ git status commit a4d1f1bdc3822432bc94cf68d0bffb095264a004 Merge: 40e5867 b339846 Author: Kenichi

    TAKAHASHI <[email protected]> Date: 2011-11-08 17:49:09 -0800 Merge pull request #8 from esminc/tapp-grep-filter-gemfile filter Gemfile on tapp grep (thanks kakutani) $ git ls-tree HEAD 100644 blob 476fcf245ea98e5b53c1bab8e4649fded29deafb .gitignore 100644 blob 8ced21a16d6f7a27031f42b42ed50c58ccd0437b CHANGELOG.md 100644 blob 7ca6519299b1f11b9b40e6e47ff82ccb1318a9c6 Gemfile 100644 blob 3b2c28480b4333df5d64316fb185776f31a64aaa LICENSE 100644 blob bb91262ae86a22e7e943c2fef7d2ed6a3f5a3850 README.rdoc 100644 blob c702cfccca1ced72a75bfd5b26e5e91d71c40b9f Rakefile 040000 tree a7b194b502ea1c0a1c351c057bc79c350b2ea9c7 bin 040000 tree a58e4002624c16f977f4a9bdcb3dbb7bdfdae407 lib 100644 blob 659747ab02ba3d057cb61df2c9ea4dc49e84b182 tapp.gemspec $ git ls-tree HEAD:lib 100644 blob 831db79304eeb1f41920b2c41074c4c9a8980ef9 tapp.rb 040000 tree 958acbdfa5bbb4cb6b42c2020d49e9934b1c69b8 tapp $ git ls-tree HEAD:lib/tapp 100644 blob fca06de5860379429be9e81b7efd087387f26f6b command.rb 100644 blob baaf6dd99cd986f245152ec19b315f0d13d097ad version.rb

18. rootͳtreeͷ Έ͚͔ͭͨ

19. • commit • ͍ͭɾ୭͕ɾͲͷcommitͷࢠͱͯ͠ • ࠜͬ͜ͷtree(ʹͿΒԼ͕ΔtreeͱblobҰࣜ) Λ࡞͔ͬͨ • tree •

    blob

20. $ git cat-file commit HEAD tree 616ecd5707ab2e0c2902ce75da7040a0bea30ed4 parent 40e58671aed9266f55fc4a93b746caf30bc13fc4 parent

    b339846bd6e592f6d5d1911e4a9a9332f0b07255 author Kenichi TAKAHASHI <[email protected]> 1320803349 -0800 committer Kenichi TAKAHASHI <[email protected]> 1320803349 -0800 Merge pull request #8 from esminc/tapp-grep-filter-gemfile filter Gemfile on tapp grep (thanks kakutani) $ git ls-tree 616ecd5707ab2 100644 blob 476fcf245ea98e5b53c1bab8e4649fded29deafb .gitignore 100644 blob 8ced21a16d6f7a27031f42b42ed50c58ccd0437b CHANGELOG.md 100644 blob 7ca6519299b1f11b9b40e6e47ff82ccb1318a9c6 Gemfile 100644 blob 3b2c28480b4333df5d64316fb185776f31a64aaa LICENSE 100644 blob bb91262ae86a22e7e943c2fef7d2ed6a3f5a3850 README.rdoc 100644 blob c702cfccca1ced72a75bfd5b26e5e91d71c40b9f Rakefile 040000 tree a7b194b502ea1c0a1c351c057bc79c350b2ea9c7 bin 040000 tree a58e4002624c16f977f4a9bdcb3dbb7bdfdae407 lib 100644 blob 659747ab02ba3d057cb61df2c9ea4dc49e84b182 tapp.gemspec

21. $ git status commit a4d1f1bdc3822432bc94cf68d0bffb095264a004 Merge: 40e5867 b339846 Author: Kenichi

    TAKAHASHI <[email protected]> Date: 2011-11-08 17:49:09 -0800 Merge pull request #8 from esminc/tapp-grep-filter-gemfile filter Gemfile on tapp grep (thanks kakutani) $ git ls-tree HEAD 100644 blob 476fcf245ea98e5b53c1bab8e4649fded29deafb .gitignore 100644 blob 8ced21a16d6f7a27031f42b42ed50c58ccd0437b CHANGELOG.md 100644 blob 7ca6519299b1f11b9b40e6e47ff82ccb1318a9c6 Gemfile 100644 blob 3b2c28480b4333df5d64316fb185776f31a64aaa LICENSE 100644 blob bb91262ae86a22e7e943c2fef7d2ed6a3f5a3850 README.rdoc 100644 blob c702cfccca1ced72a75bfd5b26e5e91d71c40b9f Rakefile 040000 tree a7b194b502ea1c0a1c351c057bc79c350b2ea9c7 bin 040000 tree a58e4002624c16f977f4a9bdcb3dbb7bdfdae407 lib 100644 blob 659747ab02ba3d057cb61df2c9ea4dc49e84b182 tapp.gemspec $ git ls-tree HEAD:lib 100644 blob 831db79304eeb1f41920b2c41074c4c9a8980ef9 tapp.rb 040000 tree 958acbdfa5bbb4cb6b42c2020d49e9934b1c69b8 tapp $ git ls-tree HEAD:lib/tapp 100644 blob fca06de5860379429be9e81b7efd087387f26f6b command.rb 100644 blob baaf6dd99cd986f245152ec19b315f0d13d097ad version.rb

22. / Users moro hello.txt foo README lib foo.rb bin foo

    / Users moro hello.txt foo README lib foo.rb bin foo v1 v2 / Users moro hello.txt foo README lib foo.rb bin foo v3 tree: abc efgh5678 tree: def tree: xyz hello world! v1ͷࢠͱͯ͠ɺ2011-11-11ʹͰ͖ͨΑɻ த਎͸tree: def͔ΒͨͲΕΔΑ v2ͷࢠͱͯ͠ɺ2011-11-12ʹͰ͖ͨΑɻ த਎͸tree: xyz͔ΒͨͲΕΔΑ

23. •commit͕Θ͔Ε͹root tree͕Θ͔Δ •root tree͕Θ͔Ε͹ͿΒԼ͕Δtreeͱ blob͕Θ͔Δ •treeͱblob͕Θ͔Ε͹ϑΝΠϧͱσΟ ϨΫτϦͱͯ͠औΓग़ͤΔ Ͳ͏ͯ͠commit͕େࣄ͔

24. •commit͕Θ͔Ε͹਌ͷcommit͕Θ ͔Δ •਌ͷcommit͕Θ͔Ε͹ɺͦͷ࣌ͷ ϑΝΠϧ(blob)΍σΟϨΫτϦ(tree)͕ Θ͔Δ •ཤྺΛ؅ཧͰ͖Δ! Ͳ͏ͯ͠commit͕େࣄ͔

25. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html

26. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html ͭ·Γ(JUͰ͸ɺੈք͸γϯϓϧͳ ίϛοτΦϒδΣΫτͷू߹Ͱ͋Γɺ ͦΕͧΕͷίϛοτΦϒδΣΫτ͕ଞ ͷUSFF΍CMPCΛࢀর͢ΔUSFFΛ อ࣋͠ɺCMPCʹ͸σʔλ͕อ؅͞Ε ͍ͯΔɻ͜ΕΑΓ΋ෳࡶͳશͯ͸ɺ୯ ʹ༻ޠతͳ০Γʹ͗͢ͳ͍

27. commitΛ Ί͙Δ๯ݥ

28. •ͳʹ΋଍͞ͳ͍ •git log •҉໧ͰݱϒϥϯνͷHEAD

29. •HEAD •git log HEAD •ݱϒϥϯνͷHEAD

30. •commitͷsha1 •git log b33984 •શ෦Ͱͳͯ͘΋͍͍

31. •ϒϥϯνͱ͔ •tagͱ͔

32. •ϒϥϯνͬͯͳʹ? •tag͸? •commitͷผ໊

33. •λά •git log rel-2011-01 •λά͕ࢦ͢ίϛοτ

34. •ϒϥϯνͬͯͳʹ? •commitͷੵΈॏͳΓ͕৳ͼ͍ͯ͘ํ ޲Λࢦ͢΋ͷ •tag͸? Ҏޙɺσʔλͱͯ͠ͷcommit object͸commitɺgit commit͢Δ ͜ͱ͸ίϛοτͱݺͼ·͢

35. •git commitͰίϛοτ͢Δͱ •commit ΦϒδΣΫτ͕Ͱ͖Δ •ϒϥϯνͷઌ಄(HEAD) ͕ͦͷcommitΦϒ δΣΫτΛࢦ͢Α͏ʹॻ͖มΘΔ

36. •git checkout <ϒϥϯν>͢Δͱ •ϒϥϯνͷHEAD͕ࢦ͢commit͕ ࢀর͍ͯ͠Δtree͔Βඥ෇͘ιʔε ҰࣜΛworking treeʹల։͢Δɻ

37. •ϒϥϯνͬͯͳʹ? •commitͷੵΈॏͳΓ͕৳ͼ͍ͯ͘ํ ޲Λࢦ͢΋ͷ •ͦͯ͠ଟ͘ͷ৔߹ɺͷͼ͖ͯͨઌ಄ͭ ·ΓHEADΛࢦ͢ •tag͸?

38. •ϒϥϯν໊ •git log cli •ϩʔΧϧϒϥϯνcliͷHEAD

39. •͍֮͑ͯ·͔͢: ͳʹ΋଍͞ͳ͍ •git log •҉໧ͰݱϒϥϯνͷHEAD

40. •ϦϞʔτϒϥϯν໊ •git log origin/cli •ϦϞʔτϦϙδτϦoriginͷ cliϒϥϯνͷHEAD

41. •ϦϞʔτϒϥϯν໊ •git log origin/cli •ϦϞʔτϦϙδτϦoriginͷ cliϒϥϯνͷHEAD

42. remote ϦϞʔτ

43. •ԕ͘ʹ͋Δrepoʹ໊લΛ͚ͭͨ΋ͷ • [email protected]:esminc/tapp.git ͱ͔͍ͭ΋ࢦఆͨ͘͠ͳ͍͠Ͷ •ผͷrepoʹؚ·ΕΔϒϥϯνΛ remotes/#{໊લ} ҎԼʹ͍࣋ͬͯΔ •ࢀরͨ͠ΓɺϩʔΧϧϒϥϯνʹ checkoutͨ͠Γɺpushͨ͠ΓͰ͖Δ

44. •ϦϞʔτ(ͷrepoʹؔ࿈෇͍ͨͪΐͬͱ ಛघͳ)ϒϥϯν •௚઀checkoutͰ͖ͳ͍ (detachedʹͳΔɻڪΖ͠΍…) •git fetch #{repo໊}ͰϦϞʔτͷ commitΛऔಘͰ͖Δ

45. push ϓογϡ

46. •खݩͷcommit(ͨͪɻؚઌ૆)Λ remoteʹૹΓࠐΉ •git push #{repo໊} #{commit} •commitͷࢦఆํ๏͸લड़ͷͱ͓Γ

47. •git log master..origin/master • ϩʔΧϧʹͳ͍ɺ୭͔͕࡞ͬͨίϛοτ • ࠨʹͳͯ͘ӈʹ͋Δcommit

48. •blob(ϑΝΠϧ) •git log origin/master...master:\ path/to/file •origin/masterʹͳͯ͘masterʹ͋ Δpath/to/fileͷมߋΛݟΔ

49. ଓ͖͸ggr "git tree-ish"

50. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html ͭ·Γ(JUͰ͸ɺੈք͸γϯϓϧͳ ίϛοτΦϒδΣΫτͷू߹Ͱ͋Γɺ ͦΕͧΕͷίϛοτΦϒδΣΫτ͕ଞ ͷUSFF΍CMPCΛࢀর͢ΔUSFFΛ อ࣋͠ɺCMPCʹ͸σʔλ͕อ؅͞Ε ͍ͯΔɻ͜ΕΑΓ΋ෳࡶͳશͯ͸ɺ୯ ʹ༻ޠతͳ০Γʹ͗͢ͳ͍ɻ

51. Git ΛϘτϜΞοϓ͔Βཧղ͢Δ http://keijinsonyaban.blogspot.com/2011/05/git.html ίϛοτΛཧղ͢Δ͜ͱ͸(JUΛཧ ղ͢Δ伴ͩɻ͋ͳͨͷ৺͕ίϛοτͷ τϙϩδΛͨͩड༰͢Δ࣌ɺϒϥϯ νɺλάɺϩʔΧϧˍϦϞʔτϦϙδ τϦ౳ͷࠞཚ͸ஔ͖ڈΓʹ͞Εɺ͋ͳ ͨ͸ӥஐ͋Δષɾϒϥϯνϯάͷ஍ฏ ΁ͱୡͨ͠ͷΛ஌ΔͩΖ͏ɻ