モデルから知るGit
23 likes3,422 views
Git is a distributed version control system invented by Linus Torvalds that stores data in a file system made up of snapshots of a project over time. It allows developers to work collaboratively by tracking changes to files and coordinating code changes between team members or branches of development. Git uses a client-server model with local repositories that can be pushed to and pulled from remote repositories hosted on services like GitHub.
モデルから知るGit
- 1. Git 2011 3 9 (id:hiratara)
- 2. • (id:hiratara) • • Perl Python Java Haskell • Git
- 3. • Git • • •
- 4. hoge.git/ hoge/.git/ bare config config refs refs ... ... dir hoge/ dir .gitignore hoge.txt dir ...
- 5. Git
- 7. Git
- 8. .git/ • .git/config git config • .git/refs/...
- 10. Author: hiratara Date: 2/25 13:43:42 typo index.html images/flower.gif css/index.css js/index.js
- 11. • ( ) • 2 • ( root) •
- 12. • • = index.html = flower.gif index.js
- 13. git svn SVN Git A B C D
- 14. git svn git merge --squash SVN Git
- 15. git svn • git • git ID → • →
- 16. git • • → • ID
- 17. remotes/origin/master tags/0.9973 heads/topic heads/master
- 18. =refs/heads • ref .git/refs • .git/refs/tags/ • .git/refs/heads/ • .git/refs/remotes/
- 19. ref • .git/ • .git/refs/ • .git/refs/tags/ • .git/refs/heads/ • .git/refs/remotes/
- 20. ref • 2 heads/hiratara/master remotes/hiratara/master • hiratara/master • remotes/hiratara/master
- 21. topic master
- 22. git commit(1) topic 1 master
- 23. git commit(2) topic 1 2 master
- 24. topic 1 2 master
- 25. git merge topic 1 2 master
- 26. git commit(3) topic 1 2 master 3
- 27. topic topic 1 2 master 3
- 28. git commit(4) topic 1 2 4 master 3
- 29. ID • ID →ID • ID → ID →ID
- 30. ID SHA1 • • ID
- 31. • ID →ID → • Git
- 32. topic B C master A
- 33. git rebase B C B C master topic A B’ C’
- 34. topic B C master A
- 35. git cherry-pick B topic B C master A B'
- 36. git cherry-pick C topic B C master A B' C'
- 37. master A B C
- 38. rebase -i HEAD~3 master A' B' C' A B C A B C
- 39. reflog • • git reflog show master C master
- 40. master A' B' C' A B C
- 41. git reset C A' B' C' master A B C
- 42. master A B C
- 43. git revert A master A B C -A
- 44. topic master
- 45. commit topic master
- 46. git merge master topic master
- 48. 3 .git topic master A B C D D D
- 49. • • • staged cached
- 50. .git topic master A B C D D D’
- 51. git add .git topic master A B C D add D’ D’
- 52. .git topic master A B C D D’ D’’
- 53. git add .git topic master A B C D add D’’ D’’
- 54. git commit .git topic master A B C D D’’ commit D’’ D’’
- 55. • D’ → •
- 56. 3 .git topic master A B C D commit -a commit commit filename add D’ D’’
- 57. (1) .git topic master A B C D D D
- 58. git checkout master .git topic master A B C D C C
- 59. (2) .git topic master A B C D D' D''
- 60. git checkout master . .git topic master A B C D C C
- 61. git checkout . .git topic master A B C D D' D'
- 62. (1) .git topic master A B C D C' C''
- 63. git reset --soft topic .git topic master A B C D C' C''
- 64. git reset topic .git topic master A B C D D C''
- 65. git reset --hard topic .git topic master A B C D D D
- 67. • (origin/master ) • git fetch git push
- 68. git@github.com:him/hoge.git A B C D master ~/git-repos/hoge A B C X master
- 69. git remote add github => git@github.com:him/hoge.git A B C D master git remote add github git@... ~/git-repos/hoge A B C X master
- 70. git fetch github => git@github.com:him/hoge.git A B C D master git fetch github ~/git-repos/hoge ( git remote update) D github/master A B C X master
- 71. refspec • • push, fetch (fetch ) github heads/from git fetch github from:to heads/to ※ heads heads/to git push github from:to heads/from
- 72. fetch refspec • git remote add •
- 73. merge rebase github => git@github.com:him/hoge.git A B C D master ~/git-repos/hoge git rebase github/master D github/master A B C X X` master
- 74. git push github => git@github.com:him/hoge.git A B C D X` master ~/git-repos/hoge git push github D github/master A B C X X` master
- 75. push refspec • refspec →" push" • push.default nothing, matching, tracking, current • remote.<name>.push (F/W fetch )
- 76. fetch pull push(1) github => git@github.com:him/hoge.git heads/master heads/another git fetch github ~/git-repos/hoge remote.<name>.fetch remotes/github/master remotes/github/another heads/master heads/local-branch heads/another
- 77. fetch pull push(2) github => git@github.com:him/hoge.git heads/master heads/another branch.<name>.remote ~/git-repos/hoge git pull = fetch + merge remotes/github/master remotes/github/another branch.<name>.merge heads/master heads/local-branch heads/another
- 78. fetch pull push(3) github => git@github.com:him/hoge.git heads/master heads/another git push github ~/git-repos/hoge push.default=matching remotes/github/master remotes/github/another heads/master heads/local-branch heads/another
- 79. github origin/topic1 master origin/master topic1 master
- 80. hanako taro clone origin/topic1 master origin/master topic1 master origin/topic1 origin/master
- 81. hanako topic2 origin/topic1 master origin/master topic1 master origin/topic1 topic2 origin/master
- 82. hanako taro fork origin/topic1 master origin/master topic1 master origin/topic1 topic2 origin/master topic1 master
- 83. git remote -f add origin/topic1 master origin/master topic1 master hanako/topic1 origin/topic1 topic2 hanako/master origin/master topic1 master
- 84. git push hanako topic2 origin/topic1 master origin/master topic1 master hanako/topic1 origin/topic1 topic2 hanako/topic2 topic2 hanako/master origin/master topic1 master
- 85. tarou pull-req origin/topic1 master origin/master topic1 master pull request hanako/topic1 origin/topic1 topic2 hanako/topic2 topic2 hanako/master origin/master topic1 master
- 86. taro remote add hanako/topic1 master hanako/topic2 origin/topic1 hanako/master origin/master topic1 master hanako/topic1 origin/topic1 topic2 hanako/topic2 topic2 hanako/master origin/master topic1 master
- 87. merge hanako/topic2 hanako/topic1 master hanako/topic2 origin/topic1 hanako/master origin/master topic1 master hanako/topic1 origin/topic1 topic2 hanako/topic2 topic2 hanako/master origin/master topic1 master
- 88. git push origin master hanako/topic1 master hanako/topic2 origin/topic1 hanako/master origin/master master origin/master topic1 hanako/topic1 origin/topic1 topic2 hanako/topic2 topic2 hanako/master origin/master topic1 master
- 89. github
- 90. • git svn → • git