0
GIT<br />Distributed Version Control Systems<br />Johannes Thönes<br />johannes.thoenes@gmail.com<br />DNUG Koblenz / 2011...
Version Control Systems<br />Quick VCS History<br />Why Git?<br />A Git Example<br />
Git Workflows<br />Git SVN<br />GitHub<br />
	Version Control Systems<br />
	Changesets<br />D<br />
	Revision<br />BASE<br />r101<br />HEAD<br />D<br />D<br />
	Commit<br />HEAD<br />r101<br />D<br />
	Repository<br />BASE<br />D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D...
	Working Copy<br />r101<br />
	Branching<br />trunk<br />r102<br />r101<br />r103<br />r104<br />r105<br />
	Merge<br />trunk<br />r102<br />r101<br />r103<br />r104<br />r105<br />r106<br />experimental<br />
	Fork<br />
	Tag<br />release-1.2.5<br />r101<br />r103<br />r102<br />r104<br />
	Quick VCS History<br />
	RCS<br />ci<br />document<br />document, v<br />co<br />
	CVS<br />commit<br />Repository<br />WorkingCopy<br />checkout<br />
	SVN<br />commit<br />Repository<br />WorkingCopy<br />checkout<br />
	Git<br />commit<br />push<br />RemoteRepository<br />LocalRepository<br />WorkingCopy<br />fetch/pull<br />checkout<br />
	Git Index<br />add/rm<br />commit<br />reset<br />checkout<br />
	Why Git?<br />
Cheap Local Branching<br />
Everything is local<br />
Git is Small<br />
Staging Area<br />
Distributed<br />
Secure<br />
Workflow<br />
	A Git Example<br />
git clone<br />master<br />master<br />stable-1.2<br />
git add<br />git commit<br />git rm<br />
git push<br />git pull<br />
git branch accounting_ui<br />master<br />accounting_ui<br />git checkout accounting_ui<br />
git checkout master<br />git pull<br />git checkout accounting_ui<br />git rebase master<br />
	Rebase<br />trunk<br />experimental<br />r2<br />R4‘<br />R5‘<br />r1<br />r3<br />r4<br />r5<br />experimental<br />
master<br />master<br />accounting_ui<br />stable-1.2<br />accounting_ui<br />git push<br />
git fetch<br />master<br />master<br />stable-1.2<br />new_accounting_ui<br />accounting_ui<br />git branch --tracking new...
git remote	 add …<br />git clone<br />git push<br />git pull<br />
git checkout master<br />git merge accounting_ui 	--no-ff<br />git push<br />
	Git Workflows<br />
Central<br />Larry<br />Sally<br />BOB<br />
Central<br />Alice<br />Larry<br />Sally<br />
Dictator<br />LEUTENANT Module 1<br />LEUTENANT Module 2<br />DEV 2<br />DEV 5<br />DEV 4<br />DEV 1<br />DEV 6<br />DEV 3...
	Git SVN<br />
git svn clone<br />
git svn init<br />
git svn fetch <br />
git svn rebase <br />
git svn dcommit<br />
git svn show-ignore >> .git/info/exclude <br />
	GitHub<br />
Questions?<br />
Online Refences<br /><ul><li>http://book.git-scm.com
http://www.kernel.org/pub/software/scm/git/docs
http://git.or.cz/gitwiki/FrontPage
http://progit.org/book
http://whygitisbetterthanx.com</li></ul>Windows Clients<br /><ul><li>msysGit - http://code.google.com/p/msysgit
SmartGit - http://www.syntevo.com/smartgit
Upcoming SlideShare
Loading in...5
×

Git

1,277

Published on

My introduction presentation to Git at the DNUG User Group Koblenz in September 2011.

Download the file and check the notes!

Published in: Technology, Business
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
1,277
On Slideshare
0
From Embeds
0
Number of Embeds
3
Actions
Shares
0
Downloads
32
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Transcript of "Git"

  1. 1. GIT<br />Distributed Version Control Systems<br />Johannes Thönes<br />johannes.thoenes@gmail.com<br />DNUG Koblenz / 2011-09-21<br />
  2. 2. Version Control Systems<br />Quick VCS History<br />Why Git?<br />A Git Example<br />
  3. 3. Git Workflows<br />Git SVN<br />GitHub<br />
  4. 4. Version Control Systems<br />
  5. 5. Changesets<br />D<br />
  6. 6. Revision<br />BASE<br />r101<br />HEAD<br />D<br />D<br />
  7. 7. Commit<br />HEAD<br />r101<br />D<br />
  8. 8. Repository<br />BASE<br />D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D D <br />r101<br />r102<br />r103<br />r104<br />r105<br />HEAD<br />
  9. 9. Working Copy<br />r101<br />
  10. 10. Branching<br />trunk<br />r102<br />r101<br />r103<br />r104<br />r105<br />
  11. 11. Merge<br />trunk<br />r102<br />r101<br />r103<br />r104<br />r105<br />r106<br />experimental<br />
  12. 12. Fork<br />
  13. 13. Tag<br />release-1.2.5<br />r101<br />r103<br />r102<br />r104<br />
  14. 14. Quick VCS History<br />
  15. 15. RCS<br />ci<br />document<br />document, v<br />co<br />
  16. 16. CVS<br />commit<br />Repository<br />WorkingCopy<br />checkout<br />
  17. 17. SVN<br />commit<br />Repository<br />WorkingCopy<br />checkout<br />
  18. 18. Git<br />commit<br />push<br />RemoteRepository<br />LocalRepository<br />WorkingCopy<br />fetch/pull<br />checkout<br />
  19. 19. Git Index<br />add/rm<br />commit<br />reset<br />checkout<br />
  20. 20. Why Git?<br />
  21. 21. Cheap Local Branching<br />
  22. 22. Everything is local<br />
  23. 23. Git is Small<br />
  24. 24. Staging Area<br />
  25. 25. Distributed<br />
  26. 26. Secure<br />
  27. 27. Workflow<br />
  28. 28. A Git Example<br />
  29. 29.
  30. 30. git clone<br />master<br />master<br />stable-1.2<br />
  31. 31. git add<br />git commit<br />git rm<br />
  32. 32. git push<br />git pull<br />
  33. 33. git branch accounting_ui<br />master<br />accounting_ui<br />git checkout accounting_ui<br />
  34. 34. git checkout master<br />git pull<br />git checkout accounting_ui<br />git rebase master<br />
  35. 35. Rebase<br />trunk<br />experimental<br />r2<br />R4‘<br />R5‘<br />r1<br />r3<br />r4<br />r5<br />experimental<br />
  36. 36. master<br />master<br />accounting_ui<br />stable-1.2<br />accounting_ui<br />git push<br />
  37. 37. git fetch<br />master<br />master<br />stable-1.2<br />new_accounting_ui<br />accounting_ui<br />git branch --tracking new_accounting_ui remotes/origin/accounting_ui<br />
  38. 38.
  39. 39.
  40. 40. git remote add …<br />git clone<br />git push<br />git pull<br />
  41. 41. git checkout master<br />git merge accounting_ui --no-ff<br />git push<br />
  42. 42. Git Workflows<br />
  43. 43. Central<br />Larry<br />Sally<br />BOB<br />
  44. 44. Central<br />Alice<br />Larry<br />Sally<br />
  45. 45. Dictator<br />LEUTENANT Module 1<br />LEUTENANT Module 2<br />DEV 2<br />DEV 5<br />DEV 4<br />DEV 1<br />DEV 6<br />DEV 3<br />
  46. 46. Git SVN<br />
  47. 47. git svn clone<br />
  48. 48. git svn init<br />
  49. 49. git svn fetch <br />
  50. 50. git svn rebase <br />
  51. 51. git svn dcommit<br />
  52. 52. git svn show-ignore >> .git/info/exclude <br />
  53. 53. GitHub<br />
  54. 54.
  55. 55.
  56. 56.
  57. 57.
  58. 58.
  59. 59.
  60. 60.
  61. 61.
  62. 62. Questions?<br />
  63. 63. Online Refences<br /><ul><li>http://book.git-scm.com
  64. 64. http://www.kernel.org/pub/software/scm/git/docs
  65. 65. http://git.or.cz/gitwiki/FrontPage
  66. 66. http://progit.org/book
  67. 67. http://whygitisbetterthanx.com</li></ul>Windows Clients<br /><ul><li>msysGit - http://code.google.com/p/msysgit
  68. 68. SmartGit - http://www.syntevo.com/smartgit
  69. 69. TortoiseGit - http://code.google.com/p/tortoisegit</li></ul> References<br />
  70. 70. Thank you<br />
  71. 71. Appendix<br />
  72. 72. The Speaker<br />Johannes Thönes<br />Software Trainer at<br />CompuGroup Medical Software<br />Johannes.thoenes@gmail.comhttp://jthoenes.bergischweb.de<br />jthoenes<br />
  73. 73. Images<br />Cheap Local Branching http://www.flickr.com/photos/calliope/5664674040<br />Everything is Localhttp://www.flickr.com/photos/downhilldom1984/6034381675<br />Git is Small http://www.flickr.com/photos/mullica/5676120685<br />Staging Area http://www.flickr.com/photos/96dpi/2589006785<br />Distributed http://www.flickr.com/photos/uqbar/114320354<br />Secure http://www.flickr.com/photos/carlosluzz/561920999<br />Workflow http://www.flickr.com/photos/cblue98/5115058146<br />Questions http://www.flickr.com/photos/t3rmin4t0r/2365831019<br />Thank Youhttp://en.wikipedia.org/wiki/File:Leonard_Nimoy_by_Gage_Skidmore_2.jpg<br />
  74. 74. License<br />This presentation can be re-used under the terms of: Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)<br />See: http://creativecommons.org/licenses/by-sa/3.0/<br />
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×