Git Resources

git-resources.md

Git Resources

General

• GitHub git cheatsheet
• GitHub for Developers Interactive Book
• Git Documentation
• ProGit Online Book
• Carpentries Lesson
• Git Workflow for Open Source

Helpful Commands used frequently

git status

git log

git remote -v

git fetch

Carol prefers

git rebase

Carol prefers

• GitLab doc

git merge

Many use, Carol rarely uses

git pull

Many use, Carol rarely uses

git push

git diff

git stash

Helpful Commands used less frequently

git rebase -i

git cherry-pick

git bisect

Useful to identify the commit where an error was introduced when you have a long history. It basically takes history and keeps dividing it into error / no-error. Narrowing the possibilities each time.

• GitLab Doc

Advanced

• GitHub git submodules vs subtrees

Carol's Opinionated Open Source Workflow

Designed to reduce merge conflicts

https://speakerdeck.com/willingc/yes-you-can-git