diff --git a/README.md b/README.md index 64369f9..7403ec6 100644 --- a/README.md +++ b/README.md @@ -1287,16 +1287,30 @@ End-to-end tests: ### Version control (Git) +Learning Git, courses and books: + - πŸ“– [Git Book](https://git-scm.com/book/en/v2) +- [Git from the inside out](https://codewords.recurse.com/issues/two/git-from-the-inside-out) +- [Git Tutorials and Training](https://www.atlassian.com/git/tutorials), Atlassian +- [Git Immersion](https://gitimmersion.com/) +- [A Visual Git Reference](http://marklodato.github.io/visual-git-guide/index-en.html) (a bit more advanced) +- [Think Like (a) Git](http://think-like-a-git.net/) + +Cheat sheets: + - [Git Cheat Sheet](https://github.com/arslanbilal/git-cheat-sheet) - [git-tips](https://github.com/git-tips/tips) -- [Git from the inside out](https://codewords.recurse.com/issues/two/git-from-the-inside-out) - [Oh Shit, Git!?!](https://ohshitgit.com/) + +More specific topics: + - [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) - [Git Merge vs. Rebase: What’s the Diff?](https://hackernoon.com/git-merge-vs-rebase-whats-the-diff-76413c117333) - πŸ™ [Story-telling with Git rebase](https://speakerdeck.com/aemeredith/story-telling-with-git-rebase) - πŸ™ [Git Rebase vs. Merge](https://speakerdeck.com/mrfoto/git-rebase-vs-merge) - πŸ™ [10 Git Anti Patterns You Should be Aware of](https://speakerdeck.com/lemiorhan/10-git-anti-patterns-you-should-be-aware-of) +- [Learn Git Branching](https://learngitbranching.js.org/): an interactive game +- [Fix conflicts only once with git rerere](https://medium.com/@porteneuve/fix-conflicts-only-once-with-git-rerere-7d116b2cec67) ### Work ethics, productivity & work/life balance