projects / swc-workshop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f1f4dfa 551e85f)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 02:42:08 +0000 (19:42 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 02:42:08 +0000 (19:42 -0700)
commit1181ded838105cdafd3ec44d9c39629f4659f7aa
tree02b07fb755741c262fc297799c5dd2842942d691tree | snapshot
parentf1f4dfae43f26b3106195b2337006e3c721c730acommit | diff
parent551e85f8f6ba0325b9bfccdb70be8541a7b5be96commit | diff
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.

  $ git merge --log --no-ff --strategy ours master

* master:
  shell: Add a submodule with POSIX shell examples
Base material for Software Carpentry, holding subject-level submodules