Your SlideShare is downloading. ×
Git'in on Windows
Upcoming SlideShare
Loading in...5
×

Thanks for flagging this SlideShare!

Oops! An error has occurred.

×
Saving this for later? Get the SlideShare app to save on your phone or tablet. Read anywhere, anytime – even offline.
Text the download link to your phone
Standard text messaging rates apply

Git'in on Windows

1,078
views

Published on

This speech aims to provide the basics of git, integrating with GitHub and TFS on the Windows platform.

This speech aims to provide the basics of git, integrating with GitHub and TFS on the Windows platform.

Published in: Technology

0 Comments
3 Likes
Statistics
Notes
  • Be the first to comment

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

Report content
Flagged as inappropriate Flag as inappropriate
Flag as inappropriate

Select your reason for flagging this presentation as inappropriate.

Cancel
No notes for slide

Transcript

  • 1. Git’in on WindowsAn introduction to git on the Microsoft platform
  • 2. About MeStacy Vicknair, MVP MCPDDevelopment Consultant for SparkhoundBlog - http://www.wtfnext.comBRAG - http://www.braglunch.comTM - http://www.batonrougespeaks.comTwitter: @svicknEmail: stacy.vicknair@sparkhound.com
  • 3. Agenda• What is git?• Why (or why not) choose git?• Where do I git it?• git’in the basics• git’in against GitHub• git’in against TFS• Resources
  • 4. What is git?• Distributed Version Control System (DVCS) – Like TFS’s source control, but “distributed”• Open Source under GNU LGPL v2.1• Freely available from http://git-scm.com
  • 5. What is DVCS?• No true “central repository”• Not a checkout, it’s a clone• Check in when you want• Push to central server when it’s stable
  • 6. Who’s git’in it• The Linux Kernel• Google for the Android OS• Ruby on Rails• PostgreSQL• Eclipse• Perl• Codeplex• … Git.
  • 7. Why (or why not) choose git?Pros Cons• Free • Windows Second-Class• Distributed (self replicating) • Barrier to entry• Lightweight • Different permissions• Secure via SSH / HTTPS paradigm• Changeset driven • It’s not ALM, just DVCS• Easy branching / merging • Single repo management – Google’s Repo• Disconnected check-ins*based on Clearvision White Paper
  • 8. Where do I git it? (see what I did there)git GitExtensionshttp://git-scm.com/ GUI / Explorer and VS integration for Windows http://code.google.com/p/msysgit/msysgitGit for Windows gitflowhttp://code.google.com/p/msysgit/ Git extensions for high level branch process workflow https://github.com/nvie/gitflowposh-gitGit extensions for Powershellhttps://github.com/dahlbyk/posh-gitgit-tfsAllows for TFS access via githttps://github.com/git-tfs/git-tfs
  • 9. Git’in the BasicsOm nom nom knowledge
  • 10. Git Basics: Staging Image from http://progit.org
  • 11. Git Basics: Ground levelgit init – Create a repogit add – Stage files in the indexgit commit – Commit a filegit status – List current modificationsgit log – List of checkin history
  • 12. Git Basics: Stash, Branch and Mergegit stash – Hold changes for later retrievalgit branch – Create, delete and list branchesgit checkout – Switch branchesgit rebase – Rebase branch from parentgit merge – Merge from child branch
  • 13. Git Intermediates: Repo AdministrationImages from http://whygitisbetterthanx.com
  • 14. Git Intermediates:Repo Administration
  • 15. Git Intermediates:Repo Administration
  • 16. Git Intermediates:Repo Administration
  • 17. Git’in against GitHub yeehaw
  • 18. Git’in GitHub: Creating and Cloning• GitHub requires SSH• git clone – Copy existing repository locally• git push - Push changes to a different repo• git remote – Create, list and delete connected repos• git tag – Tags a version of the code
  • 19. Git’in against TFS Moo.
  • 20. Git’in TFS: clone, .gitignore, and checkintool• .gitignore files help prevent unwanted checkins• git tfs clone – Pull TFS repo with history• git tfs quickclone – No history• git tfs checkintool – TFS-esque checkin process• git tfs checkin – Git-esque quick checkin
  • 21. Agenda• What is git?• Why (or why not) choose git?• Where do I git it?• git’in the basics• git’in against GitHub• git’in against TFS• Resources
  • 22. ResourcesTutorials stacy.vicknair@sparkhound.comhttp://progit.orghttp://book.git-scm.com/ @svicknDownloadshttp://git-scm.com/http://code.google.com/p/msysgit/https://github.com/dahlbyk/posh-githttps://github.com/git-tfs/git-tfshttp://code.google.com/p/msysgit/https://github.com/nvie/gitflowPresentation Resourceshttp://stackoverflow.com/questions/4140133/how-does-tfss-shelveset-model-compare-to-a-dvcshttp://haacked.com/archive/2011/12/19/get-git-for-windows.aspxhttp://nathanj.github.com/gitguide/tour.htmlhttp://www.clearvision-cm.com/whitepapers/Clearvision%20-%20Git%20White%20Paper.pdfhttp://whygitisbetterthanx.com

×