Commits

Steve Losh committed 3dc6497

More work.

Comments (0)

Files changed (2)

use-version-control/style.stylesheets

     display: block;
 }
 
+div.omg h1 {
+    text-align: center;
+    font-size: 5em;
+    font-weight: bold;
+}
+
 ol {
     font-size: 1.05em;
     margin-top: 1em;

use-version-control/use-version-control.md

 
 # What about files on your own computer?
 
+ 
+
+# What about keeping track of **whole folders**?
 
 !SLIDE
 
 # Wouldn't it be nice to be able to keep track of your important files without uploading them somewhere?
 
 
+!SLIDE
+
+# You **could** just copy the files, right?
+
+
+!SLIDE omg
+
+# NO
+
+
+!SLIDE omg
+
+# STOP
+
+
+!SLIDE images
+
+# Let go of the Ctrl and C keys.
+
+
 !SLIDE images
 
 # This is unacceptable.
 
 !SLIDE
 
+# We can do better.
+
+
+!SLIDE
+
 # This is a version control system:
 # [Mercurial][]
 
 
  
 
-# You want to "check in" your files as you work.
+# You "check in" your changes as you work.
 
 
 !SLIDE
 
 !SLIDE
 
-# So how does it work?
+# So how does it **work**?
 
 
 !SLIDE images
 
 !SLIDE
 
-# Every time you "commit" the current state of your website is recorded by the kitten.
+# Every time you "commit" the current state of your project is recorded by the kitten.
 
  
 
 # You can use version control to restore **any** committed version.
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 !SLIDE
 
-# Learn More
-
- 
-
-## Mercurial
+# Learn More about Mercurial
 
 * [Mercurial](http://hg-scm.org)
 * [Mercurial: The Definitive Guide](http://hgbook.red-bean.com/)
-* [#mercurial on Freenode IRC](irc://irc.freenode.net/#mercurial)
+* [hg init](http://hginit.com/) (a Mercurial tutorial)
+* [#mercurial](irc://irc.freenode.net/#mercurial) (an IRC channel)
+* [hg tip](http://hgtip.com/) (tips for using Mercurial)
 
- 
 
-## Git
+!SLIDE
+
+# Learn More about Git
 
 * [Git](http://git-scm.com)
 * [Pro Git](http://progit.org/)
-* [#git on Freenode IRC](irc://irc.freenode.net/#git)
+* [#git](irc://irc.freenode.net/#git) (an IRC channel)
+* [git ready](http://gitready.com/) (tips for using Git)
 
 
 !SLIDE
 # Credits
 
 * <http://www.flickr.com/photos/danielfoster/2829251197/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-!SLIDE code
-
-@@@ python
-    def foo
-      :bar
-    end
-@@@
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.