Differences

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

--- git_slides [2014/10/21 12:53] – [Wie ist der Ablauf?] admin
+++ git_slides [2014/10/21 12:55] – [Links] admin
@@ Line 40: / Line 40: @@
 ===== Links =====
-Cheatsheet: http://ndpsoftware.com/git-cheatsheet.html
+Cheatsheet / Commands: http://ndpsoftware.com/git-cheatsheet.html
+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/