Git and GitHub

General

• Using Git Bash requires a basic understanding of the command line.
• This simple Git Cheat Sheet lists the most commonly-used commands.
• A visual representation of Git concepts is useful for understanding the effects of various git commands.
• Documentation on GitHub often takes the form of Markdown (.md) files and these are automatically converted to HTML. Markdown is easy to learn; start with this beginner guide.

Working with the Commit History

• How to keep your Git history clean with interactive rebase is a good article. Alternatively, watch the YouTube videos below.
• Rewriting Git history explains how to amend, reword, delete, reorder, fixup and split commits. Commits can also be squashed (combined).

Merging

• An explanation of git merge.
• A quick tutorial on how to resolve merge conflicts.