Git Resources and Tutorials

I recently had to do some research about how Git worked. I saw on YouTube Introduction to Git with Scott Chacon of GitHub which was great for general concepts. But the one that answered most of my questions was this one by Patrick Hogan:

First of all finally figured how to do a fetch and merge instead of a pull.

git fetch

git merge origin/master

Now among the resources listed by Patrick:

• Git Tower a mac graphic client for Git
• Kaleidoscope an app to spot differences between files.
• DiffMerge: an application to visually compare and merge files within Windows, Mac OS X and Linux.
• Git Immersion: A very nice tutorial for git.
• Gitolite: allows you to setup git hosting on a central server, with very fine-grained access control and many (many!) more powerful features.

Another great resource I found was Git – setting up a remote repository and doing an initial “push” where the author explains how to display the current branch on your terminal.