summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Thu, 24 Oct 2013 02:42:08 +0000 (19:42 -0700)]
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
W. Trevor King [Thu, 24 Oct 2013 02:41:21 +0000 (19:41 -0700)]
README.md: Add nesting modular/
This gives the submodule-averse the nesting they'd usually get by
merging the master branch in a submodule at modular/. They'll have to
merge the submodule's 'namespaced' branches by hand to pull in the
equivalent content.
W. Trevor King [Thu, 24 Oct 2013 02:40:19 +0000 (19:40 -0700)]
shell: Add a submodule with POSIX shell examples
W. Trevor King [Thu, 24 Oct 2013 02:39:40 +0000 (19:39 -0700)]
README.md: Summarize the purpose of this repository