Your SlideShare is downloading. ×
0
Git’in on WindowsAn introduction to git on the     Microsoft platform
About MeStacy Vicknair, MVP MCPDDevelopment Consultant for SparkhoundBlog - http://www.wtfnext.comBRAG - http://www.braglu...
Agenda•   What is git?•   Why (or why not) choose git?•   Where do I git it?•   git’in the basics•   git’in against GitHub...
What is git?• Distributed Version Control System (DVCS)  – Like TFS’s source control, but “distributed”• Open Source under...
What is DVCS?•   No true “central repository”•   Not a checkout, it’s a clone•   Check in when you want•   Push to central...
Who’s git’in it•   The Linux Kernel•   Google for the Android OS•   Ruby on Rails•   PostgreSQL•   Eclipse•   Perl•   Code...
Why (or why not) choose git?Pros                                Cons• Free                              • Windows Second-C...
Where do I git it?                                         (see what I did there)git                                      ...
Git’in the BasicsOm nom nom knowledge
Git Basics: Staging    Image from http://progit.org
Git Basics: Ground levelgit init – Create a repogit add – Stage files in the indexgit commit – Commit a filegit status – L...
Git Basics: Stash, Branch and Mergegit stash – Hold changes for later retrievalgit branch – Create, delete and list branch...
Git Intermediates:                    Repo AdministrationImages from http://whygitisbetterthanx.com
Git Intermediates:Repo Administration
Git Intermediates:Repo Administration
Git Intermediates:Repo Administration
Git’in against GitHub        yeehaw
Git’in GitHub: Creating and Cloning• GitHub requires SSH• git clone – Copy existing repository locally• git push - Push ch...
Git’in against TFS       Moo.
Git’in TFS: clone, .gitignore, and checkintool• .gitignore files help prevent unwanted  checkins• git tfs clone – Pull TFS...
Agenda•   What is git?•   Why (or why not) choose git?•   Where do I git it?•   git’in the basics•   git’in against GitHub...
ResourcesTutorials                                                       stacy.vicknair@sparkhound.comhttp://progit.orghtt...
Upcoming SlideShare
Loading in...5
×

Git'in on Windows

1,110

Published on

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,110
On Slideshare
0
From Embeds
0
Number of Embeds
0
Actions
Shares
0
Downloads
23
Comments
0
Likes
3
Embeds 0
No embeds

No notes for slide

Transcript of "Git'in on Windows"

  1. 1. Git’in on WindowsAn introduction to git on the Microsoft platform
  2. 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. 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. 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. 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. 6. Who’s git’in it• The Linux Kernel• Google for the Android OS• Ruby on Rails• PostgreSQL• Eclipse• Perl• Codeplex• … Git.
  7. 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. 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. 9. Git’in the BasicsOm nom nom knowledge
  10. 10. Git Basics: Staging Image from http://progit.org
  11. 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. 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. 13. Git Intermediates: Repo AdministrationImages from http://whygitisbetterthanx.com
  14. 14. Git Intermediates:Repo Administration
  15. 15. Git Intermediates:Repo Administration
  16. 16. Git Intermediates:Repo Administration
  17. 17. Git’in against GitHub yeehaw
  18. 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. 19. Git’in against TFS Moo.
  20. 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. 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. 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
  1. A particular slide catching your eye?

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

×