During my time at my job, during my learning process, I came up cheat sheets, just as a means of quick access when I got stuck on a problem, or whenever I needed reminding. A lot of good tips for easy reference.
Guide on undoing mess-ups
https://www.atlassian.com/git/tutorials/undoing-changes
Other ways to deal with Commit issues
https://dev.to/isabelcmdcosta/how-to-undo-the-last-commit--31mg
You'll commit the changes you've made to your branch so far, checkout master, `git pull`, checkout your branch and then `git merge master`
So you’ve fucked up a commit, and you want to roll that shit back:
Git revert <hash of commit>
Maybe you wanna roll back a merge:
https://mijingo.com/blog/reverting-a-git-merge
Maybe you wanna roll back a few:
https://stackoverflow.com/questions/4114095/how-to-revert-a-git-repository-to-a-previous-commit
About gitignore
https://www.atlassian.com/git/tutorials/saving-changes/gitignore
Cherry-picking git commits
http://schacon.github.io/git/git-cherry-pick.html
Renaming git branches
https://linuxize.com/post/how-to-rename-local-and-remote-git-branch/
Keeping that motherfucking git history clean, son
https://spin.atomicobject.com/2017/04/23/maintain-clean-git-history/
Merging vs Rebsing:
https://www.atlassian.com/git/tutorials/merging-vs-rebasing
Git Merge vs. Rebase: What’s the diff?
https://hackernoon.com/git-merge-vs-rebase-whats-the-diff-76413c117333
Interactive Rebasing:
https://blog.algolia.com/master-git-rebase/
More shit on rebase squash, amend, and other ways of writing history
https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history
