projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 307d4bf 646271b)
Merge branch 'master' into assembled
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:38:43 +0000 (12:38 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:38:43 +0000 (12:38 -0700)
commit8f3a72e6c74eeef8e76ec953f1c47ea38d74816c
tree5f791c4d7868266fb430f032b984e66ae312dcc1tree | snapshot
parent307d4bffe76ecd2e1231972f0ee379518a16e8fbcommit | diff
parent646271bb7ff09410f1fcb16b93229ddbfdbf9c7acommit | diff
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
Base material for Software Carpentry, holding subject-level submodules