b0346bc1317469436fc2bb612831107fc0792a49
Git.md
| ... | ... | @@ -27,12 +27,15 @@ A very quick and shallow guide on how to get started with git. |
| 27 | 27 | This talk seems to cover the basics on how to get started, but also with a few internals mixed in. |
| 28 | 28 | |
| 29 | 29 | ### Intermediate |
| 30 | -- (Currently Incomplete) Blog-Series about more advanced topics about the usage and the environment of git. |
|
| 30 | +- Blog-Series about more advanced topics about the usage and the environment of git. |
|
| 31 | 31 | - Creating the perfect commit: [https://css-tricks.com/creating-the-perfect-commit-in-git/](https://css-tricks.com/creating-the-perfect-commit-in-git/) |
| 32 | 32 | - Branching strategies: [https://css-tricks.com/branching-strategies-in-git/](https://css-tricks.com/branching-strategies-in-git/) |
| 33 | 33 | - Better collaboration with pull requests: [https://css-tricks.com/better-collaboration-with-pull-requests/](https://css-tricks.com/better-collaboration-with-pull-requests/) |
| 34 | 34 | - Merge conflicts: [https://css-tricks.com/merge-conflicts-what-they-are-and-how-to-deal-with-them/](https://css-tricks.com/merge-conflicts-what-they-are-and-how-to-deal-with-them/) |
| 35 | 35 | - Rebase vs Merge: [https://css-tricks.com/rebase-vs-merge-integrating-changes-in-git/](https://css-tricks.com/rebase-vs-merge-integrating-changes-in-git/) |
| 36 | + - Interactive Rebase: Clean up your Commit History [https://css-tricks.com/interactive-rebase-clean-up-your-commit-history/](https://css-tricks.com/interactive-rebase-clean-up-your-commit-history/) |
|
| 37 | + - Cherry-Picking Commits in Git [https://css-tricks.com/cherry-picking-commits-in-git/](https://css-tricks.com/cherry-picking-commits-in-git/) |
|
| 38 | + - Using the Reflog to Restore Lost Commits [https://css-tricks.com/using-the-reflog-to-restore-lost-commits/](https://css-tricks.com/using-the-reflog-to-restore-lost-commits/) |
|
| 36 | 39 | - Visual Git Reference: [http://marklodato.github.io/visual-git-guide/index-en.html](http://marklodato.github.io/visual-git-guide/index-en.html) |
| 37 | 40 | Visualizations about how common git commands work. |
| 38 | 41 |