Git

Git (and Github)

Introductory Material

• 15 minute introduction to Git
• Setting up Git
• You definitely want to setup SSH keys for password-less access
• Fix the line endings issue - you can thank me later!
• Learn Git branching
• Guide to git commit messages from Wordpress

Tools

• Github's tool for Mac and Windows
• Source Tree (Which I personally use)
• Gitg for Linux
• Command line - learn the basic command line stuff: git clone, git status, git add, git commit -m 'my commit message', git push, git pull. If you're using the windows shell, you're fighting a bit of an uphill battle. I would recommend using Git through Cygwin so you get all the nice POSIXy (i.e. Mac and Linux style) goodness. The majority of tutorial, Q&A and help topics are written assuming a POSIX shell

More Advanced Stuff

• A great transition talk to more advanced Git fundamentals
• I enjoy Gary Bernhardt's use and explanation of Git in his series of screencasts. You should also check out some of his other talks, they're hillariously amazing
• For larger projects and larger teams, I recommend using the Gitflow approach. Branches are your friend!
• http://merrigrove.blogspot.com.au/2014/02/why-heck-is-git-so-hard-places-model-ok.html
• http://stackoverflow.com/questions/2530060/can-you-explain-what-git-reset-does-in-plain-english/2530073#2530073
• http://schacon.github.io/gitbook/1_the_git_object_model.html
• http://eagain.net/articles/git-for-computer-scientists/
• http://marklodato.github.io/visual-git-guide/index-en.html
• https://people.gnome.org/~federico/news-2008-12.html
• http://stevebennett.me/2012/02/24/10-things-i-hate-about-git/

Github

What Github gives you:

1. Source Control (duh)
2. Private repositories
3. Issue Tracking
4. Wiki
5. Gists (small, shareable snippets of code)

Bitbucket is another solid choice for hosted source code management however I prefer Github's auxiliary tools (see above) better.

If you are thinking of hosting your own Git server behind your firewall. Don't. Unless you are a spy agency.

Useful Scripts

Pretty Log Messages

git config --global alias.lg "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"

# then use
git lg