886078651b847678aed852949604a50eafc6d65a
Git.md
| ... | ... | @@ -22,30 +22,30 @@ Cheat sheets are a great way to keep an overview over all the different commands |
| 22 | 22 | |
| 23 | 23 | Two rather unconventional ones: |
| 24 | 24 | |
| 25 | -- Interactive Cheat Sheet (Webapp): [https://ndpsoftware.com/git-cheatsheet.html](https://ndpsoftware.com/git-cheatsheet.html) |
|
| 26 | -- Escape a git mess, step-by-step: [http://justinhileman.info/article/git-pretty/git-pretty.png](http://justinhileman.info/article/git-pretty/git-pretty.png) |
|
| 25 | +- [Interactive Cheat Sheet (Webapp)](https://ndpsoftware.com/git-cheatsheet.html) |
|
| 26 | +- [Escape a git mess, step-by-step](http://justinhileman.info/article/git-pretty/git-pretty.png) |
|
| 27 | 27 | |
| 28 | 28 | And two conventional ones: |
| 29 | 29 | |
| 30 | -- Github Education Cheat Sheet: [https://education.github.com/git-cheat-sheet-education.pdf](https://education.github.com/git-cheat-sheet-education.pdf) |
|
| 31 | -- Git Cheat Sheet listing the most important basic commands: [https://github.com/nerdgirl/git-cheatsheet-visual/blob/master/gitcheatsheet.pdf](https://github.com/nerdgirl/git-cheatsheet-visual/blob/master/gitcheatsheet.pdf) |
|
| 30 | +- [Github Education Cheat Sheet](https://education.github.com/git-cheat-sheet-education.pdf) |
|
| 31 | +- [Git Cheat Sheet](https://github.com/nerdgirl/git-cheatsheet-visual/blob/master/gitcheatsheet.pdf) listing the most important basic commands |
|
| 32 | 32 | |
| 33 | 33 | ### Quicklinks |
| 34 | 34 | |
| 35 | -- Interatively visualizing commits and branches, including merging, rebasing, and simulating a remote repository: [https://learngitbranching.js.org/?NODEMO&locale=en_US](https://learngitbranching.js.org/?NODEMO&locale=en_US) |
|
| 35 | +- Interatively visualizing commits and branches, including merging, rebasing, and simulating a remote repository: [learngitbranching.js.org](https://learngitbranching.js.org/?NODEMO&locale=en_US) |
|
| 36 | 36 | |
| 37 | 37 | ## Interesting reads |
| 38 | 38 | |
| 39 | 39 | - [The (written) unwritten guide to pull requests](https://www.atlassian.com/blog/git/written-unwritten-guide-pull-requests) |
| 40 | 40 | - Blog-Series about more advanced topics about the usage and the environment of git. |
| 41 | - - Creating the perfect commit: [https://css-tricks.com/creating-the-perfect-commit-in-git/](https://css-tricks.com/creating-the-perfect-commit-in-git/) |
|
| 42 | - - Branching strategies: [https://css-tricks.com/branching-strategies-in-git/](https://css-tricks.com/branching-strategies-in-git/) |
|
| 43 | - - Better collaboration with pull requests: [https://css-tricks.com/better-collaboration-with-pull-requests/](https://css-tricks.com/better-collaboration-with-pull-requests/) |
|
| 44 | - - 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/) |
|
| 45 | - - 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/) |
|
| 46 | - - 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/) |
|
| 47 | - - Cherry-Picking Commits in Git [https://css-tricks.com/cherry-picking-commits-in-git/](https://css-tricks.com/cherry-picking-commits-in-git/) |
|
| 48 | - - 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/) |
|
| 41 | + - [Creating the perfect commit](https://css-tricks.com/creating-the-perfect-commit-in-git/) |
|
| 42 | + - [Branching strategies](https://css-tricks.com/branching-strategies-in-git/) |
|
| 43 | + - [Better collaboration with pull requests](https://css-tricks.com/better-collaboration-with-pull-requests/) |
|
| 44 | + - [Merge conflicts](https://css-tricks.com/merge-conflicts-what-they-are-and-how-to-deal-with-them/) |
|
| 45 | + - [Rebase vs Merge](https://css-tricks.com/rebase-vs-merge-integrating-changes-in-git/) |
|
| 46 | + - [Interactive Rebase: Clean up your Commit History](https://css-tricks.com/interactive-rebase-clean-up-your-commit-history/) |
|
| 47 | + - [Cherry-Picking Commits in Git](https://css-tricks.com/cherry-picking-commits-in-git/) |
|
| 48 | + - [Using the Reflog to Restore Lost Commits](https://css-tricks.com/using-the-reflog-to-restore-lost-commits/) |
|
| 49 | 49 | |
| 50 | 50 | ## Learning Git |
| 51 | 51 |