Links from the talk:
* Msysgit (Git for Windows)
* GitExtensions (Wraps Git for Windows + Visual studio + more niceness)
* Gitblit (the windows friendly repository manager)
* Git for Human Beings mailing list where I hang out
* The free book online
* Git Cheat Sheet: http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html
* German Cheat Sheet: https://github.com/esc/git-cheatsheet-de/blob/master/cheatsheet.pdf
Before I start, let me give you the TLDR version:
Main Goal today: show you how Git works
Act 1: Show cmd-line action
Act 2: git internals
Act 3: Pushing around, merging
Branching and merging
Note that I use Console2, nothing fancy, it’s just a wrapper around the normal cmd line.
Set shell to be: %SystemRoot%\syswow64\WindowsPowerShell\v1.0\powershell.exe
and home to be c:\Users\tfnico
for some extra flair: https://github.com/dahlbyk/posh-git
* cinst poshgit - this gives us nice state display, still a bit laggy. I’ll leave it out for now, but you might want to use this in your daily work, if you prefer cmd line.
To reset the ps1, see
Why even have a central repository in a DVCS?
Internet Explorer: Log in as tfnico-123
Create a repo “bonnagile”, with initial commit. Clone it over https.
Use manual smart https auth
Store username/password in $HOME/_netrc
Be careful with this file though, don’t think special chars in PW’s are allowed.
Note the warning we get about config default push branches.
Do we have time to show off SSH right away?
Fork one of tfnico’s repos (guava)
Make a push request.
Awfully easy to set up. Just download, change the http port in the properties config, and start it:
Set auth on view and push
Store username and password in ~/_netrc
Using SSH keys instead of smart-http username/password make sense for many reasons, but it’s kinda exotic for Windows users. The big minus with http is that you have to store the PW in cleartext on your machine (but hey, who cares).
We’ve already Installed putty along with Git Extensions (for ssh).
In order to make it work with normal Windows command line, you have to set the environment variable GIT_SSH to point at c:\program files (x86)\gitextensions\putty\plink.exe).
Have a look at Github’s help page for more hints: http://help.github.com/ssh-issues/
git svn clone -s http://svn2.assembla.com/svn/peekr/
Teardown (to restart the demo)
Remove gitblit repos
Remove github repo
Remove github keys
Delete bonnagile project (also from github)
Remove c:\backup bare repos
Remove ps1 stuff in C:\Users\tfnico\Documents\WindowsPowerShell\...
Questions for discussion
Any war stories?
In a recent article, evolving agile over 50 months, one change included going from SVN to Git.
Seems they recently switched from doing feature branches, back into single branch. Why?
Does Git make you more agile? Or to put it another way: Does Git enable any typical agile principles or values?
Do you need Git to do Kanban?