projects / swc-boot-camp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0a0ead3 7b58e7e)
Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hello into assembled
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 19:44:27 +0000 (12:44 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 19:44:27 +0000 (12:44 -0700)
commit70ffe3dbc5a0e69dc3ba293ec647a1ad56898d5d
tree207e1edf289ab281b4e18bb9a3b08d7bd7bf7208tree | snapshot
parent0a0ead3e949c6f1f6f3610fd2009fc58fa5b3487commit | diff
parent7b58e7e58970ba36ff0b9c1b7f804903b84025d9commit | diff
Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hello into assembled

Avoid problems due to the shared history of swc-modular-shell and
swc-modular-shell-hello by restoring the subject-level files removed
in swc-modular-shell-hello:

  $ git checkout HEAD -- modular/shell/{README.md,cheat-sheet.md,instructor.md}

Conflicts:
modular/shell/instructor.md
Base material for Software Carpentry, holding subject-level submodules