Git is a version control system, or VCS, tracks the history of changes as people and teams collaborate on projects together. As developers make changes to the project, any earlier version of the project can be recovered at any time.

Developers can review project history to find out:

• Which changes were made?
• Who made the changes?
• When were the changes made?
• Why were changes needed?

Selected sections:

• Saving changes – add, commit, diff, stash
• Inspecting a repository – status, log, tag, blame
• Undoing changes – checkout, clean, revert, reset, rm
• Rewriting history – commit, rebase, reflog
• Syncing – remote, fetch, push, pull
• Using branches – branch, checkout, merge

Selected sections:

• Pushing commits to a remote repository – push
• Getting changes from a remote repository – clone, fetch, merge, pull
• Rebasing
  • About Git rebase
  • Using Git rebase on the command line
• Resolving merge conflicts
  • Resolving merge conflicts after a Git rebase
  • Resolving a merge conflict using the command line

• GitHub Git Cheat Sheet - GitHub Cheatsheets
• Git cheat sheet | Atlassian Git Tutorial
• git - the simple guide
• Oh Shit, Git!?!

Meld – Visual diff and merge tool that can be used with Git commands git difftool and git mergetool

Tig – Git repository browser