Presentation I did at NYC Code Camp about using Git and Github for .NET development on Windows.

1. Git & Github for .NET Development JP Toto VP for Application Development Cognis IT http://www.cognisit.com [email_address] @jptoto Fill this space with whatever you want (graphic, logo, whatever)

3. History of Git In 2005, the relationship between the community that developed the Linux kernel and the commercial company that developed BitKeeper broke down, and the tool’s free-of-charge status was revoked. This prompted the Linux development community (and in particular Linus Torvalds, the creator of Linux) to develop their own tool based on some of the lessons they learned while using BitKeeper. Ohai! BitKeeper screwed us so I think I’ll write my own DVCS. Natch.

4. What makes Git different? Typical SCMs use changes based on file differences:

5. What makes Git different? Git thinks of each commit of a snapshot, doesn’t re-save files that weren’t modified – only pointers.

6. The Staging Area

8. Installing Git Msysgit Tortoise GIT Git Extensions for Visual Studio $ git config --global user.name “Joe Smith" $ git config --global user.email “joe@gmail.com "

11. Branching & Merging Very FAST! Only uses pointers instead of copying whole files, folders, and projects. Git encourages lots of branching / merging. $ git branch <new branch> $ git checkout <new branch> $ git merge $ git branch –D <branch_to_delete> $ git mergetool

12. Branching & Merging

13. Rebasing

14. Remotes $ git remote $ git remote add origin git://github.com/jptoto/project.git $ git fetch / git pull $ git push $ git remote show origin

15. Github

17. What if I’m used to SVN? $git clone [url] $svn checkout [url] $git pull $svn update $git init $svnadmin create “repo” $git add . $svn import file://repo $git commit $git merge [branch] $svn merge -r 20:HEAD http://url/branches/ branch