I do the same; only with vimwiki (so today's diary is just two key strokes away).
https://github.com/vimwiki/vimwiki
I recently found a blogpost describing a way to add 'commit hooks' to vimwiki so that my repository is automatically synchronised when I make edits. You can still fall back on command line git for fixing merges / anything else.
http://jarvistmoorefrost.wordpress.com/2014/06/25/snippet-co...
This may sound like a "solve everything with git" type comment, but honestly, I have found that keeping a set of markdown files in a git repository (frequently pushed to github) works well for me. I can have a quick script that appends a default journal file for thoughts I don't want to spend time organizing immediately. For everything else, I open up the relevant .md file and add a bullet point.
So far it's working better than anything I've experimented with over the last ten years.