Git for Windows Developers

An overview of how Git works and tips for Windows developers.

This talk was presented at the Oklahoma City Developers Group on November 5th, 2012.

Transcript

1. GIT
2. mkchandler.com @mkchandler twitter / github / etc. blog / talks Hobby Lobby developer
3. WHAT IS GIT?
4. easy local branching workflow flexibility small and fast distributed version control multi-platform
5. GIT WORKS OFFLINE branching merging committing tagging rebasing
6. EXCHANGING INFORMATION push fetch pull
7. SETTING UP GIT
8. http://git-scm.com/downloads EASY INSTALLER PACKAGES BUILD GIT VIA GIT $ git clone https://github.com/git/git.git
9. SET UP YOUR .GITCONFIG $ git config --global user.name “Matt Chandler” $ git config --global user.email “mkchandler@gmail.com” CREATE A .GITIGNORE [Bb]in/ [Oo]bj/ TestResults *.suo *.user *.sln.docstates # more files and folders...
10. SETTING A GLOBAL .GITIGNORE $ git config --global core.excludesfile ~\.global_ignore .GITIGNORE TEMPLATES https://github.com/github/gitignore
11. HELPFUL APPS ON WINDOWS git-credentials-winstore https://github.com/anurse/git-credential-winstore GitPad https://github.com/github/GitPad posh-git https://github.com/dahlbyk/posh-git GitHub for Windows https://windows.github.com
12. DISTRIBUTED WORKFLOWS
13. SUBVERSION-STYLE WORKFLOW Graphic by Scott Chacon (http://git-scm.com) is licensed under the Creative Commons Attribution 3.0 Unported License.
14. INTEGRATION MANAGER WORKFLOW Graphic by Scott Chacon (http://git-scm.com) is licensed under the Creative Commons Attribution 3.0 Unported License.
15. DICTATOR AND LIEUTENANTS WORKFLOW Graphic by Scott Chacon (http://git-scm.com) is licensed under the Creative Commons Attribution 3.0 Unported License.
16. DEVELOPMENT WORKFLOWS
17. always what is in production master branch hotfix branches new features, merged in to master when ready feature branches bug fixes, merged in to master and long running feature branches when ready
18. C1 C4 C5 C6 C3 C2 feature master
19. C1 C4 C6 C8 C3 C2 feature master C5 hotfix C7
20. GIT TIPS
21. CUSTOMIZE YOUR ENVIRONMENT choose a gui diff/merge tool https://gist.github.com/2377564
22. CUSTOMIZE YOUR ENVIRONMENT make use of aliases [alias] co = checkout st = status tags = tag -l branches = branch -a remotes = remote -v
23. RESOURCES
24. git-scm.com gitref.org gitready.com