new version control resource

mattmakai · mattmakai · commit a81a4bd6546a · 2015-05-12T11:27:29.000-07:00
diff --git a/all.html b/all.html
@@ -4302,6 +4302,11 @@ <h2>Git resources</h2>
   through all aspects of using the version control system.</p>
 </li>
 <li>
+<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
+  is a clear and concise essay explaining the fundamental concepts of
+  Git.</p>
+</li>
+<li>
 <p><a href="http://wildlyinaccurate.com/a-hackers-guide-to-git">A Hacker's Guide to Git</a>
   covers the basics as well as more advanced Git commands while explaining each
   step along the way.</p>
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-10T11:25:28Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-12T11:27:23Z</updated></feed>
diff --git a/source-control.html b/source-control.html
@@ -136,6 +136,11 @@ <h2>Git resources</h2>
   through all aspects of using the version control system.</p>
 </li>
 <li>
+<p><a href="http://maryrosecook.com/blog/post/git-in-six-hundred-words">Git in Six Hundred Words</a>
+  is a clear and concise essay explaining the fundamental concepts of
+  Git.</p>
+</li>
+<li>
 <p><a href="http://wildlyinaccurate.com/a-hackers-guide-to-git">A Hacker's Guide to Git</a>
   covers the basics as well as more advanced Git commands while explaining each
   step along the way.</p>
diff --git a/source/content/pages/07-web-app-deployment/08-source-control.markdown b/source/content/pages/07-web-app-deployment/08-source-control.markdown
@@ -100,6 +100,10 @@ reviews the basics of distributed version control systems.
 * [Pro Git](http://git-scm.com/book) is a free open source book that walks 
   through all aspects of using the version control system.
 
+* [Git in Six Hundred Words](http://maryrosecook.com/blog/post/git-in-six-hundred-words)
+  is a clear and concise essay explaining the fundamental concepts of
+  Git.
+
 * [A Hacker's Guide to Git](http://wildlyinaccurate.com/a-hackers-guide-to-git)
   covers the basics as well as more advanced Git commands while explaining each
   step along the way.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-10T11:25:28Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-12T11:27:23Z</updated></feed>`