summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Wed, 23 Oct 2013 19:40:04 +0000 (12:40 -0700)]
Merge branch 'namespaced' of git://tremily.us/swc-setup into assembled
W. Trevor King [Wed, 23 Oct 2013 19:38:43 +0000 (12:38 -0700)]
Merge branch 'master' into assembled
This is a no-op merge, explicitly considering and rejecting the
submodules from the master branch. After this merge, future merges
from the master branch will pick up any content changes.
$ git merge --log --no-ff --strategy ours master
* master:
setup: Add a submodule with student-setup utilities
version-control: Add a submodule with my subject-level notes
W. Trevor King [Wed, 23 Oct 2013 19:21:15 +0000 (12:21 -0700)]
setup: Add a submodule with student-setup utilities
W. Trevor King [Wed, 23 Oct 2013 19:29:56 +0000 (12:29 -0700)]
Merge branch 'master' into namespaced
This is a no-op merge, explicitly considering and rejecting the
submodules from the master branch. After this merge, future merges
from the master branch will pick up any content changes.
* master:
installation-test: Add a submodule with my installation test scripts
windows-installer: Add a submodule with Ethan's Windows installer
get-my-ip: Add a submodule with my IP detection script
W. Trevor King [Wed, 23 Oct 2013 19:18:41 +0000 (12:18 -0700)]
README.md: Add nesting setup/
This gives the submodule-averse the nesting they'd usually get by
merging the master branch in a submodule at setup/. They'll have to
merge the submodule's 'namespaced' branches by hand to pull in the
equivalent content.
W. Trevor King [Wed, 23 Oct 2013 19:16:35 +0000 (12:16 -0700)]
installation-test: Add a submodule with my installation test scripts
W. Trevor King [Wed, 23 Oct 2013 19:11:21 +0000 (12:11 -0700)]
windows-installer: Add a submodule with Ethan's Windows installer
W. Trevor King [Wed, 23 Oct 2013 19:07:53 +0000 (12:07 -0700)]
get-my-ip: Add a submodule with my IP detection script
W. Trevor King [Wed, 23 Oct 2013 19:06:42 +0000 (12:06 -0700)]
README: Summarize the purpose of this repository
W. Trevor King [Wed, 23 Oct 2013 13:03:49 +0000 (06:03 -0700)]
version-control: Add a submodule with my subject-level notes
W. Trevor King [Wed, 23 Oct 2013 05:39:10 +0000 (22:39 -0700)]
instructor.md: Move README.md to instructor.md
This is instructor-facing content. We still need an inspirational
blurb for the student-facing README.
Jon Pipitone [Fri, 1 Feb 2013 18:08:26 +0000 (13:08 -0500)]
Conversion of all rst to corresponding markdown files
We use git-flavoured markdown
W. Trevor King [Fri, 23 Nov 2012 13:48:45 +0000 (08:48 -0500)]
.mailmap: standardize identifiers for Joshua, Katy, Matt, and Sri
arokem [Mon, 25 Mar 2013 00:37:18 +0000 (17:37 -0700)]
Ignore weird mac DS_Store files.
Matt [Mon, 24 Sep 2012 16:20:21 +0000 (13:20 -0300)]
Update LICENSE.md
Joshua Ryan Smith [Mon, 11 Jun 2012 01:07:18 +0000 (21:07 -0400)]
Added CC license.
Removed cruft.
W. Trevor King [Fri, 11 Jan 2013 18:03:15 +0000 (13:03 -0500)]
README.md: Line wrapping and reference-style links
This makes the README easier to read in a terminal or editor, while
leaving the Markdown output unchanged.
Matt Davis [Sun, 30 Dec 2012 03:26:39 +0000 (22:26 -0500)]
Adding contributing guidelines.
Includes license, workflow, and file formats sections.
Matt Davis [Sat, 29 Dec 2012 17:44:50 +0000 (12:44 -0500)]
Adding some useful developer info and links to the README.
Signed-off-by: Matt Davis <jiffyclub@gmail.com>
W. Trevor King [Mon, 31 Dec 2012 13:48:00 +0000 (08:48 -0500)]
.mailmap: Standardize identifiers for Lynne and Matt
Matt Davis [Sat, 29 Dec 2012 03:30:20 +0000 (22:30 -0500)]
Adding .gitignore.
Matt [Fri, 23 Nov 2012 02:14:38 +0000 (18:14 -0800)]
Initial commit
projects / swc-workshop.git / log