repository: initial arguments from Joshua

From: "Joshua Ryan Smith Ph.D." <joshua.r.smith@gmail.com>
Date: Mon, 29 Oct 2012 19:47:48 -0400
Subject: Re: [Gits] Software Carpentry Gits

Skimmed?!? :)

Here are some arguments for side B...
repository: argument for multiple repos

From: Joshua Ryan Smith <joshua.r.smith@gmail.com>
Date: Mon, 05 Nov 2012 18:31:42 -0500
Subject: Re: [Gits] The case for 1 workshops repo
Message-ID: <50984C5E.3080000@gmail.com>

Here's a crack at the argument for multiple repos. I tried to edit it
down from the seven volume set I originally wrote...
branch: initial arguments for the workshop-branch model

From: "W. Trevor King" <wking@odin.tremily.us>
Date: Tue, 6 Nov 2012 18:33:38 -0500
Subject: Re: [Gits] Software Carpentry Gits
Message-ID: <20121106233338.GB10364@odin.tremily.us>

Here is an overview of the single repo (side A) option...
branch: condensed my argument to get under 250 words

We'll have to strip the footnotes to get there, but that's ok.

From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 12 Nov 2012 17:06:11 -0500
Subject: Re: [Gits] Software Carpentry Gits
Message-ID: <20121112220611.GI29758@odin.tremily.us>

Here is an overview of the single repo (side A) option...
branch: expanded summary with ASCII-art DAGs

From: "W. Trevor King" <wking@tremily.us>
Date: Thu, 15 Nov 2012 21:44:02 -0500
Subject: Side-A summary (workshop-branches), version 3
Message-ID: <20121116024402.GA16609@odin.tremily.us>

Here's my third pass at making my ideas clear, structured as a how-to
guide to the workflow.  Edits, reorganization, and comments welcome.
I had been refering to this as the single-repo model, but I think a
better characterization is the workshop-branches model (vs. Joshua's
workshop-repos model).
branch: wrap long "workshop branch" line
branch: shorten example git/basic commit message
repository: restructure Joshua's arguments to match my organization

This lets you focus on the differences with a side-by-side diff:

  $ sdiff -tw 150 branch repository
repository: fix an extra 2012-12-my-workshop -> master rename
Merge remote-tracking branch 'matt-davis/master'

Streamlined workshop-branch description.  I've fixed some encoding
issues in Matt's verison.
branch: mimic Matt's 'workshop' -> 'boot camp' change in the intro
branch: mimic Matt's tree/clone ordering
branch: remove trailing whitespace after a tree ellipsis
branch: mimic Matt's index -> README changes
branch: mimic Matt's can -> may gh-pages change
branch: mimic Matt's Markdown-centrism :p
branch: mimic Matt's removal of example content file types
branch: remove unwise workflows

The direct-master-commit (was 1) and cherry-pick (was 3) workflows are
not great ideas in general.  Matt suggested they be removed, so I'm
removing them to make the initial proposal simpler.  I expect both
styles to happen in practice, but it's probably not a good idea to be
advertising them.