summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Tue, 29 Oct 2013 22:58:56 +0000 (15:58 -0700)]
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:
dictionary.txt: Remove nesting 1-Shell/
W. Trevor King [Tue, 29 Oct 2013 22:25:00 +0000 (15:25 -0700)]
dictionary.txt: Remove nesting 1-Shell/
There's no need to hard-code target directories in this repository.
Anyone consuming this material can use submodules and pick their own
target directory.
Sasha Wood [Sun, 17 Jun 2012 01:06:07 +0000 (21:06 -0400)]
Added a dictionary to 1-Shell directory to demonstrate searching
in less. Necessary to replace /usr/share/dict/american-english
that went away when we changed VMs.