about to present

TODO.txt

@@ -0,0 +1,7 @@
+* applying patches via email
+* accepting pull requests, managing contributors
+* github section
+
+* README instructions
+
+* slides online

central_repos/01_central.md

@@ -0,0 +1,184 @@
+!SLIDE center subsection
+# Central Repositories #
+
+!SLIDE center
+![](img/central.png)
+
+!SLIDE
+# First Come, First Served #
+
+!SLIDE center
+![img/central/central.284-001.jpg](img/central/central.284-001.jpg)
+
+!SLIDE center
+![img/central/central.285-001.jpg](img/central/central.285-001.jpg)
+
+!SLIDE center
+![img/central/central.286-001.jpg](img/central/central.286-001.jpg)
+
+!SLIDE center
+![img/central/central.287-001.jpg](img/central/central.287-001.jpg)
+
+!SLIDE center
+![img/central/central.288-001.jpg](img/central/central.288-001.jpg)
+
+!SLIDE center
+![img/central/central.289-001.jpg](img/central/central.289-001.jpg)
+
+!SLIDE center
+![img/central/central.290-001.jpg](img/central/central.290-001.jpg)
+
+!SLIDE center
+![img/central/central.291-001.jpg](img/central/central.291-001.jpg)
+
+!SLIDE center
+![img/central/central.292-001.jpg](img/central/central.292-001.jpg)
+
+!SLIDE center
+![img/central/central.293-001.jpg](img/central/central.293-001.jpg)
+
+!SLIDE center
+![img/central/central.294-001.jpg](img/central/central.294-001.jpg)
+
+!SLIDE center
+![img/central/central.295-001.jpg](img/central/central.295-001.jpg)
+
+!SLIDE center
+![img/central/central.296-001.jpg](img/central/central.296-001.jpg)
+
+!SLIDE center
+![img/central/central.297-001.jpg](img/central/central.297-001.jpg)
+
+!SLIDE center
+![img/central/central.298-001.jpg](img/central/central.298-001.jpg)
+
+!SLIDE center
+![img/central/central.299-001.jpg](img/central/central.299-001.jpg)
+
+!SLIDE center
+![img/central/central.300-001.jpg](img/central/central.300-001.jpg)
+
+!SLIDE center
+![img/central/central.300-002.jpg](img/central/central.300-002.jpg)
+
+!SLIDE center
+![img/central/central.301-001.jpg](img/central/central.301-001.jpg)
+
+!SLIDE center
+![img/central/central.302-001.jpg](img/central/central.302-001.jpg)
+
+!SLIDE center
+![img/central/central.303-001.jpg](img/central/central.303-001.jpg)
+
+!SLIDE center
+![img/central/central.304-001.jpg](img/central/central.304-001.jpg)
+
+!SLIDE center
+![img/central/central.305-001.jpg](img/central/central.305-001.jpg)
+
+!SLIDE center
+![img/central/central.306-001.jpg](img/central/central.306-001.jpg)
+
+!SLIDE center
+![img/central/central.307-001.jpg](img/central/central.307-001.jpg)
+
+!SLIDE center
+![img/central/central.308-001.jpg](img/central/central.308-001.jpg)
+
+!SLIDE center
+![img/central/central.309-001.jpg](img/central/central.309-001.jpg)
+
+!SLIDE center
+![img/central/central.310-001.jpg](img/central/central.310-001.jpg)
+
+!SLIDE center
+![img/central/central.311-001.jpg](img/central/central.311-001.jpg)
+
+!SLIDE center
+![img/central/central.312-001.jpg](img/central/central.312-001.jpg)
+
+!SLIDE center
+![img/central/central.312-002.jpg](img/central/central.312-002.jpg)
+
+!SLIDE center
+![img/central/central.313-001.jpg](img/central/central.313-001.jpg)
+
+!SLIDE center
+![img/central/central.314-001.jpg](img/central/central.314-001.jpg)
+
+!SLIDE center
+![img/central/central.315-001.jpg](img/central/central.315-001.jpg)
+
+!SLIDE center
+![img/central/central.316-001.jpg](img/central/central.316-001.jpg)
+
+!SLIDE center
+![img/central/central.317-001.jpg](img/central/central.317-001.jpg)
+
+!SLIDE center
+![img/central/central.318-001.jpg](img/central/central.318-001.jpg)
+
+!SLIDE center
+![img/central/central.319-001.jpg](img/central/central.319-001.jpg)
+
+!SLIDE center
+![img/central/central.320-001.jpg](img/central/central.320-001.jpg)
+
+!SLIDE center
+![img/central/central.320-002.jpg](img/central/central.320-002.jpg)
+
+!SLIDE center
+![img/central/central.321-001.jpg](img/central/central.321-001.jpg)
+
+!SLIDE center
+![img/central/central.322-001.jpg](img/central/central.322-001.jpg)
+
+!SLIDE center
+![img/central/central.323-001.jpg](img/central/central.323-001.jpg)
+
+!SLIDE center
+![img/central/central.324-001.jpg](img/central/central.324-001.jpg)
+
+!SLIDE center
+![img/central/central.325-001.jpg](img/central/central.325-001.jpg)
+
+!SLIDE center
+![img/central/central.326-001.jpg](img/central/central.326-001.jpg)
+
+!SLIDE center
+![img/central/central.327-001.jpg](img/central/central.327-001.jpg)
+
+!SLIDE center
+![img/central/central.328-001.jpg](img/central/central.328-001.jpg)
+
+!SLIDE center
+![img/central/central.329-001.jpg](img/central/central.329-001.jpg)
+
+!SLIDE center
+![img/central/central.330-001.jpg](img/central/central.330-001.jpg)
+
+!SLIDE center
+![img/central/central.331-001.jpg](img/central/central.331-001.jpg)
+
+!SLIDE center
+![img/central/central.332-001.jpg](img/central/central.332-001.jpg)
+
+!SLIDE center
+![img/central/central.332-002.jpg](img/central/central.332-002.jpg)
+
+!SLIDE center
+![img/central/central.333-001.jpg](img/central/central.333-001.jpg)
+
+!SLIDE center
+![img/central/central.334-001.jpg](img/central/central.334-001.jpg)
+
+!SLIDE center
+![img/central/central.335-001.jpg](img/central/central.335-001.jpg)
+
+!SLIDE center
+![img/central/central.335-002.jpg](img/central/central.335-002.jpg)
+
+!SLIDE center
+![img/central/central.336-001.jpg](img/central/central.336-001.jpg)
+
+

central_repos/02_merge_rebase.md

@@ -0,0 +1,55 @@
+!SLIDE
+
+# Merge vs Rebase #
+
+!SLIDE bullets incremental
+
+# Advantages of Merging #
+
+* can undo the merge
+* more data for analysis later
+* easy continuous re-integration
+
+!SLIDE bullets incremental
+
+# Advantages of Rebasing #
+
+* it's prettier
+
+!SLIDE code
+
+# git pull --rebase #
+
+!SLIDE code
+
+# git fetch origin #
+
+# git rebase origin/master #
+
+!SLIDE
+
+# Otherwise, merge #
+
+!SLIDE code
+
+# git merge --no-ff #
+
+!SLIDE commandline incremental
+
+    $ (code code code)
+    $ git fetch
+    $ git log origin/master ^master
+    $ git [merge|rebase] origin/master
+    $ (test)
+    $ git push origin master
+
+!SLIDE bullets incremental
+
+# Possible Team Rules #
+
+* always --no-ff merge topic branches into master
+* always rebase work onto master
+
+
+
+

commit_guide/commit.md

@@ -0,0 +1,100 @@
+!SLIDE center subsection
+
+# Scott Chacon's Guide to Making Proper Commits #
+
+!SLIDE
+# Check them for whitespace #
+
+!SLIDE code
+
+# git diff --check #
+
+!SLIDE smaller
+
+<pre>
+<span class="grey">$ git diff --check</span>
+lib/simplegit.rb:5: trailing whitespace.
++    @git_dir = File.expand_path(git_dir)<span class="red">XX</span>
+lib/simplegit.rb:7: trailing whitespace.
++ <span class="red">XXXXXXXXXXX</span>
+lib/simplegit.rb:26: trailing whitespace.
++    def command(git_cmd)<span class="red">XXXX</span>
+</pre>
+
+!SLIDE
+# Logically Separate Changeset #
+
+!SLIDE code
+
+# git add --patch #
+
+!SLIDE center
+
+# git-gui #
+
+![](img/gitgui.png)
+
+!SLIDE center
+
+# Git Tower #
+
+![](img/git-tower.jpg)
+
+!SLIDE
+# Helpful commit message #
+
+!SLIDE smaller
+
+    Short (50 chars or less) summary of changes
+
+    More detailed explanatory text, if necessary.  Wrap it to
+    about 72 characters or so.  In some contexts, the first line
+    is treated as the subject of an email and the rest of the
+    text as the body.  The blank line separating the summary from
+    the body is critical (unless you omit the body entirely); 
+    tools like rebase can get confused if you run the two together.
+
+    Further paragraphs come after blank lines.
+
+     - Bullet points are okay, too
+
+     - Typically a hyphen or asterisk is used for the bullet, 
+       preceded by a single space, with blank lines in between, 
+       but conventions vary here
+
+!SLIDE commit
+
+    commit 71a5d4bc0e4025b3fbdeed76052b39fcef284e8c
+    Author: Jonathan Nieder <jrnieder@gmail.com>
+    Date:   Sun Dec 26 03:07:31 2010 -0600
+
+      diff: funcname and word patterns for perl
+
+      The default function name discovery already works quite well for Perl
+      code... with the exception of here-documents (or rather their ending).
+
+       sub foo {
+          print <<END
+       here-document
+       END
+          return 1;
+       }
+
+      The default funcname pattern treats the unindented END line as a
+      function declaration and puts it in the @@ line of diff and "grep
+      --show-function" output.
+
+      With a little knowledge of perl syntax, we can do better.  You can
+      try it out by adding "*.perl diff=perl" to the gitattributes file.
+
+!SLIDE
+# One Branch or Series per Topic #
+
+!SLIDE bullets incremental
+
+# Scott Chacon's Guide to Making Proper Commits Overview #
+
+* Check for whitespace
+* Logically Separate Changesets (LSC)
+* Helpful commit messages
+* One branch/series per topic

custom.css

@@ -0,0 +1,4 @@
+.green { color: #3a3;}
+.red { color: #f33;}
+.blue { color: #33f;}
+.grey { color: #888;}

final/final.md

@@ -2,13 +2,17 @@
 
 # that's it!
 
+!SLIDE
+
+# questions?
+
 !SLIDE bullets incremental small
 
 # Resources #
 
 * git-scm.com
 * gitref.org
-* progit.org
+* progit.org (chapter 5)
 * \#git / \#github on IRC
 * schacon@gmail.com