Skip to content

Instantly share code, notes, and snippets.

@paulharris
paulharris / words.md
Created November 26, 2019 02:48 — forked from fogleman/words.md
Mnemonic Encoding Word List

Mnemonic Encoding Word List

http://web.archive.org/web/20090918202746/http://tothink.com/mnemonic/wordlist.html

  • The wordlist contains 1626 words.
  • All words are between 4 and 7 letters long.
  • No word in the list is a prefix of another word (e.g. visit, visitor).
  • Five letter prefixes of words are sufficient to be unique.
  • The words should be usable by people all over the world. The list is far from perfect in that respect. It is heavily biased towards western culture and English in particular. The international vocabulary is simply not big enough. One can argue that even words like "hotel" or "radio" are not truly international. You will find many English words in the list but I have tried to limit them to words that are part of a beginner's vocabulary or words that have close relatives in other european languages. In some cases a word has a different meaning in another language or is pronounced very differently but for the purpose of the encoding it is still ok - I assume that when the encoding is
@paulharris
paulharris / git_merge_notes.txt
Created June 4, 2012 06:50
How I merged my changes into libharu
I had some code in a subfolder of a bzr repo, something like this:
my_project/mystuff/
my_project/libharu/ <-- dropped in from a tarball/git export
I had fixed some problems, now I want to push them to github and issue a pull request.
In short, I had to:
- convert from bzr to git (git bzr clone)
- split the libharu subfolder out into a branch of its own (git subtree split)
- create common merge point between my libharu and upstream