projects
/
swc-workshop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0a0ead3
7b58e7e
)
Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hello into assembled
author
W. Trevor King
<wking@tremily.us>
Thu, 24 Oct 2013 19:44:27 +0000
(12:44 -0700)
committer
W. Trevor King
<wking@tremily.us>
Thu, 24 Oct 2013 19:44:27 +0000
(12:44 -0700)
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
Trivial merge
projects / swc-workshop.git / commitdiff