1828614cfef368a72c4b4081f3cc9856d831d3c7
Git.md
| ... | ... | @@ -0,0 +1,57 @@ |
| 1 | +### The Git Parable |
|
| 2 | +- Original text by Tom Preston-Werner: [https://tom.preston-werner.com/2009/05/19/the-git-parable.html](https://tom.preston-werner.com/2009/05/19/the-git-parable.html) |
|
| 3 | +Only text, no visuals. |
|
| 4 | +- Live talk by Johan Herland: [https://www.youtube.com/watch?v=jm7QsI-nNjk&ab\_channel=NDCConferences](https://www.youtube.com/watch?v=jm7QsI-nNjk&ab_channel=NDCConferences) |
|
| 5 | +90 Minutes. Same story, but enhanced with slides and visuals. |
|
| 6 | +- Slides from the talk: [https://github.com/jherland/git\_parable/blob/master/git\_parable.pdf](https://github.com/jherland/git_parable/blob/master/git_parable.pdf) |
|
| 7 | +- Shorter video with text-to-speech audio of the original text and the slides of Johan Herland: [https://www.youtube.com/watch?v=GyHdoGZY69E&ab\_channel=JayneTheGrateful](https://www.youtube.com/watch?v=GyHdoGZY69E&ab_channel=JayneTheGrateful) |
|
| 8 | + |
|
| 9 | +### Learning (Git) by Doing |
|
| 10 | +- Hands-on step-by-step guide from the basics to advanced stuff: [https://gitimmersion.com/index.html](https://gitimmersion.com/index.html) |
|
| 11 | +This guide is creating a small project in the ruby programming language, but it seems like you don't need to know ruby in order to follow the guide. |
|
| 12 | +- Program for a playful introduction to the most important git commands: [https://ohmygit.org/](https://ohmygit.org/) |
|
| 13 | +- Website for learning branching and modifying history in git: [https://learngitbranching.js.org/](https://learngitbranching.js.org/) |
|
| 14 | +This tutorial only teaches some parts of git! Some parts are not covered at all, but the other parts are covered beyond the basics. |
|
| 15 | + |
|
| 16 | +### Git Cheat Sheets |
|
| 17 | +- Interactive Cheat Sheet: [https://ndpsoftware.com/git-cheatsheet.html](https://ndpsoftware.com/git-cheatsheet.html) |
|
| 18 | +- Github Education Cheat Sheet: [https://education.github.com/git-cheat-sheet-education.pdf](https://education.github.com/git-cheat-sheet-education.pdf) |
|
| 19 | +- 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) |
|
| 20 | +- 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) |
|
| 21 | + |
|
| 22 | +### Basics |
|
| 23 | +- Extensive Guide by Atlassian about many git commands (what they do, how to use them, and how they work): [https://www.atlassian.com/git/tutorials/setting-up-a-repository](https://www.atlassian.com/git/tutorials/setting-up-a-repository) |
|
| 24 | +- Git for the lazy: [https://wiki.spheredev.org/index.php/Git\_for\_the\_lazy](https://wiki.spheredev.org/index.php/Git_for_the_lazy) |
|
| 25 | +A very quick and shallow guide on how to get started with git. |
|
| 26 | +- Talk “Introduction to Git” by Scott Chacon: [https://www.youtube.com/watch?v=ZDR433b0HJY&ab\_channel=InfoQ](https://www.youtube.com/watch?v=ZDR433b0HJY&ab_channel=InfoQ) |
|
| 27 | +This talk seems to cover the basics on how to get started, but also with a few internals mixed in. |
|
| 28 | + |
|
| 29 | +### Intermediate |
|
| 30 | +- (Currently Incomplete) Blog-Series about more advanced topics about the usage and the environment of git. |
|
| 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 | + - Branching strategies: [https://css-tricks.com/branching-strategies-in-git/](https://css-tricks.com/branching-strategies-in-git/) |
|
| 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 | + - 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 | + - 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 | +- Visual Git Reference: [http://marklodato.github.io/visual-git-guide/index-en.html](http://marklodato.github.io/visual-git-guide/index-en.html) |
|
| 37 | +Visualizations about how common git commands work. |
|
| 38 | + |
|
| 39 | +### Advanced |
|
| 40 | +- Git Internals PDF: [https://raw.githubusercontent.com/pluralsight/git-internals-pdf/master/drafts/peepcode-git.pdf](https://raw.githubusercontent.com/pluralsight/git-internals-pdf/master/drafts/peepcode-git.pdf) |
|
| 41 | +A document explaining the internals of git (but also giving an introduction for beginners) |
|
| 42 | +- Think Like (a) Git: [http://think-like-a-git.net/](http://think-like-a-git.net/) |
|
| 43 | +Guide for people that know how to use git, but want to learn something about the internals of git. |
|
| 44 | +- Advanced Git topics by Atlassian: [https://www.atlassian.com/git/tutorials/advanced-overview](https://www.atlassian.com/git/tutorials/advanced-overview) |
|
| 45 | + |
|
| 46 | +### Specific commands |
|
| 47 | +- `git log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(bold blue)%d%Creset %s %Cgreen(%cr) %C(yellow)<%an>%Creset' --abbrev-commit` |
|
| 48 | +- `git stash`: [https://www.atlassian.com/git/tutorials/saving-changes/git-stash](https://www.atlassian.com/git/tutorials/saving-changes/git-stash) |
|
| 49 | +- `git revert`: [https://www.atlassian.com/git/tutorials/undoing-changes/git-revert](https://www.atlassian.com/git/tutorials/undoing-changes/git-revert) |
|
| 50 | +- `git bisect`: [https://git-scm.com/docs/git-bisect](https://git-scm.com/docs/git-bisect) |
|
| 51 | +- `git cherry-pick`: [https://www.atlassian.com/git/tutorials/cherry-pick](https://www.atlassian.com/git/tutorials/cherry-pick) |
|
| 52 | +- `git reflog`: [https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog) |
|
| 53 | +- `git commit --amend`: [https://www.atlassian.com/git/tutorials/rewriting-history](https://www.atlassian.com/git/tutorials/rewriting-history) |
|
| 54 | +- `git reset`: [https://www.atlassian.com/git/tutorials/undoing-changes/git-reset](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) |
|
| 55 | +- `git rebase (-i)`: [https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) |
|
| 56 | +- `git config credential.helper store` |
|
| 57 | + |
GitLinks.md
| ... | ... | @@ -1,57 +0,0 @@ |
| 1 | -### The Git Parable |
|
| 2 | -- Original text by Tom Preston-Werner: [https://tom.preston-werner.com/2009/05/19/the-git-parable.html](https://tom.preston-werner.com/2009/05/19/the-git-parable.html) |
|
| 3 | -Only text, no visuals. |
|
| 4 | -- Live talk by Johan Herland: [https://www.youtube.com/watch?v=jm7QsI-nNjk&ab\_channel=NDCConferences](https://www.youtube.com/watch?v=jm7QsI-nNjk&ab_channel=NDCConferences) |
|
| 5 | -90 Minutes. Same story, but enhanced with slides and visuals. |
|
| 6 | -- Slides from the talk: [https://github.com/jherland/git\_parable/blob/master/git\_parable.pdf](https://github.com/jherland/git_parable/blob/master/git_parable.pdf) |
|
| 7 | -- Shorter video with text-to-speech audio of the original text and the slides of Johan Herland: [https://www.youtube.com/watch?v=GyHdoGZY69E&ab\_channel=JayneTheGrateful](https://www.youtube.com/watch?v=GyHdoGZY69E&ab_channel=JayneTheGrateful) |
|
| 8 | - |
|
| 9 | -### Learning (Git) by Doing |
|
| 10 | -- Hands-on step-by-step guide from the basics to advanced stuff: [https://gitimmersion.com/index.html](https://gitimmersion.com/index.html) |
|
| 11 | -This guide is creating a small project in the ruby programming language, but it seems like you don't need to know ruby in order to follow the guide. |
|
| 12 | -- Program for a playful introduction to the most important git commands: [https://ohmygit.org/](https://ohmygit.org/) |
|
| 13 | -- Website for learning branching and modifying history in git: [https://learngitbranching.js.org/](https://learngitbranching.js.org/) |
|
| 14 | -This tutorial only teaches some parts of git! Some parts are not covered at all, but the other parts are covered beyond the basics. |
|
| 15 | - |
|
| 16 | -### Git Cheat Sheets |
|
| 17 | -- Interactive Cheat Sheet: [https://ndpsoftware.com/git-cheatsheet.html](https://ndpsoftware.com/git-cheatsheet.html) |
|
| 18 | -- Github Education Cheat Sheet: [https://education.github.com/git-cheat-sheet-education.pdf](https://education.github.com/git-cheat-sheet-education.pdf) |
|
| 19 | -- 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) |
|
| 20 | -- 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) |
|
| 21 | - |
|
| 22 | -### Basics |
|
| 23 | -- Extensive Guide by Atlassian about many git commands (what they do, how to use them, and how they work): [https://www.atlassian.com/git/tutorials/setting-up-a-repository](https://www.atlassian.com/git/tutorials/setting-up-a-repository) |
|
| 24 | -- Git for the lazy: [https://wiki.spheredev.org/index.php/Git\_for\_the\_lazy](https://wiki.spheredev.org/index.php/Git_for_the_lazy) |
|
| 25 | -A very quick and shallow guide on how to get started with git. |
|
| 26 | -- Talk “Introduction to Git” by Scott Chacon: [https://www.youtube.com/watch?v=ZDR433b0HJY&ab\_channel=InfoQ](https://www.youtube.com/watch?v=ZDR433b0HJY&ab_channel=InfoQ) |
|
| 27 | -This talk seems to cover the basics on how to get started, but also with a few internals mixed in. |
|
| 28 | - |
|
| 29 | -### Intermediate |
|
| 30 | -- (Currently Incomplete) Blog-Series about more advanced topics about the usage and the environment of git. |
|
| 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 | - - Branching strategies: [https://css-tricks.com/branching-strategies-in-git/](https://css-tricks.com/branching-strategies-in-git/) |
|
| 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 | - - 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 | - - 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 | -- Visual Git Reference: [http://marklodato.github.io/visual-git-guide/index-en.html](http://marklodato.github.io/visual-git-guide/index-en.html) |
|
| 37 | -Visualizations about how common git commands work. |
|
| 38 | - |
|
| 39 | -### Advanced |
|
| 40 | -- Git Internals PDF: [https://raw.githubusercontent.com/pluralsight/git-internals-pdf/master/drafts/peepcode-git.pdf](https://raw.githubusercontent.com/pluralsight/git-internals-pdf/master/drafts/peepcode-git.pdf) |
|
| 41 | -A document explaining the internals of git (but also giving an introduction for beginners) |
|
| 42 | -- Think Like (a) Git: [http://think-like-a-git.net/](http://think-like-a-git.net/) |
|
| 43 | -Guide for people that know how to use git, but want to learn something about the internals of git. |
|
| 44 | -- Advanced Git topics by Atlassian: [https://www.atlassian.com/git/tutorials/advanced-overview](https://www.atlassian.com/git/tutorials/advanced-overview) |
|
| 45 | - |
|
| 46 | -### Specific commands |
|
| 47 | -- `git log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(bold blue)%d%Creset %s %Cgreen(%cr) %C(yellow)<%an>%Creset' --abbrev-commit` |
|
| 48 | -- `git stash`: [https://www.atlassian.com/git/tutorials/saving-changes/git-stash](https://www.atlassian.com/git/tutorials/saving-changes/git-stash) |
|
| 49 | -- `git revert`: [https://www.atlassian.com/git/tutorials/undoing-changes/git-revert](https://www.atlassian.com/git/tutorials/undoing-changes/git-revert) |
|
| 50 | -- `git bisect`: [https://git-scm.com/docs/git-bisect](https://git-scm.com/docs/git-bisect) |
|
| 51 | -- `git cherry-pick`: [https://www.atlassian.com/git/tutorials/cherry-pick](https://www.atlassian.com/git/tutorials/cherry-pick) |
|
| 52 | -- `git reflog`: [https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog) |
|
| 53 | -- `git commit --amend`: [https://www.atlassian.com/git/tutorials/rewriting-history](https://www.atlassian.com/git/tutorials/rewriting-history) |
|
| 54 | -- `git reset`: [https://www.atlassian.com/git/tutorials/undoing-changes/git-reset](https://www.atlassian.com/git/tutorials/undoing-changes/git-reset) |
|
| 55 | -- `git rebase (-i)`: [https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) |
|
| 56 | -- `git config credential.helper store` |
|
| 57 | - |
Home.md
| ... | ... | @@ -4,4 +4,4 @@ This wiki is a collection of information worth sharing with the world! |
| 4 | 4 | |
| 5 | 5 | # Index |
| 6 | 6 | |
| 7 | -- [Resources for learning Git](./GitLinks) |
|
| 7 | +- [Resources about Git](./Git) |