projects / swc-boot-camp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d2ba38f 03ceaf9)
Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:44:40 +0000 (12:44 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 23 Oct 2013 19:44:40 +0000 (12:44 -0700)
commit48859eedbc824b90296193ed9936ccf992246362
tree1bb5b392ba3647619abe815f538e2074c43efb19tree | snapshot
parentd2ba38f7507908ad3c16cb3c7af95687aa82e117commit | diff
parent03ceaf942632835aeb84f7525f178bd9cc002b07commit | diff
Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing 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:
  README.md: Remove nesting version-control/git
Base material for Software Carpentry, holding subject-level submodules