...
Another good resource is Think Like A Git, a site who's main page states "Git shouldn't be so hard to learn."
Finally, Git for Computer Scientists is an in depth explanation of how git worksBest Practices is an excellent page with tons of information, overview and links to other good resources about best-practice usage of git.
Git Merge Strategies
Git has many "strategies" you can use while merging. Read the following carefully:
...
This is a compilation of some potentially useful git commands and/or aliases
1) Command Line commit graph
...
Check out this blog post: http://www.programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/
Not really a git trick, but a github convenience. Repositories on github can have their default branch specified. This is useful to reduce drag and prevent worry, by making github automatically select the correct branch for a pull request to go into.
Simply go to your github repository's page and click the admin link (hint: you need admin privileges), right near the top of the page there's a setting called "Default Branch".