Differences

This shows you the differences between two versions of the page.

--- git_slides [2014/10/21 12:56] – [Links] admin
+++ git_slides [2014/10/21 12:57] – [Links] admin
@@ Line 40: / Line 40: @@
 ===== Links =====
-* Cheatsheet / Commands: http://ndpsoftware.com/git-cheatsheet.html
+  * Cheatsheet / Commands:
-* Merge vs. Rebase: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/
+      * Neumodisch: http://ndpsoftware.com/git-cheatsheet.html
-* Rebase Details: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/
+      * Oldschool: https://training.github.com/kit/downloads/github-git-cheat-sheet.pdf
+  * Merge vs. Rebase: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/
+  * Rebase Details: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/