Git Git

Topics

Branches

Commands

Committing

Restore

Submodules

Pages

• Advanced
• Aliases

  Configure aliases for git

• Authors

  Show author names and their contributions to a repo

• Changes key
• Common
• Compare
• Config files
• Configure

  How to configure git

• Conflicts
• Count files in repo
• Custom SSH

  How to a specify an alternate SSH key

• Every day
• GUIs
• Git attributes file
• Hooks

  Understanding and using git hooks

• Ignore

  Reference for the Git ignore file

• Install
• Line endings

  How to configure line endings for your repo and to get them consistent

• Move and rename
• Pager

  Changing pagination behavior for git

• Permissions error
• Prune branches

  How to remove clean-up remote branches that no longer exist

• Push
• Rebase
• Remote
• Resources
• Tags
• View

  How to view git objects like commits and tags

• git diff vs git diff-index

Content

See also Git section of my Learn to Code project.

If you’re a more visual person, check out this visual Git cheat sheet available in multiple languages as well as light and dark modes.

Quick reference

Restore a file to match another branch.

$ git checkout my-feature
$ git checkout origin/master file.py