I use combination of tools. Write notes with some android wysiwyg editor, in text format; Edit on desktop with notepad++; on my linux setup gitosys with keys

I use combination of tools. Write notes with some android wysiwyg editor, in text format; Edit on desktop with notepad++; on my linux setup gitosys with keys, so could exchange with git; on android installed, what current work as cli interface with ssh and git, and just when need turn on network and do git commit; git fetch; git push; git merge, etc.