I am using Zim Wiki (http://zim-wiki.org) where the notebook directory is shared with Dropbox. It has nice features and is cross platform. There is also a Git-backend plugin that should me more robust from what I use.
I tried out exactly this one and I considered the git (or hg?) plugin to be bad. I don't know if it's better, now, but when I used it the workflow was worse than just a text editor and git. That's what I'm using now. I'm still looking for something that is usable from a my android phone. I guess there is git from android but i haven't investigated yet. The plugin did nothing automatically.
Want to edit your notes? Better make sure to pull. Edit. Save. (I guess adding was automatically) Commit. Push. Have conflicts (for no real reason). Resolve them. Push again. I didn't like it. The best par was that some functions (I guess merging) where not available from the gui. You had to open a terminal, go to .zim and use git or hg by hand. And yeah, specify commit messages. This is not a software project. It's very unlikly I'm going to revert something. Adding a commit message is just dublicating my text, because my note was 4 words long.
Want to edit your notes? Better make sure to pull. Edit. Save. (I guess adding was automatically) Commit. Push. Have conflicts (for no real reason). Resolve them. Push again. I didn't like it. The best par was that some functions (I guess merging) where not available from the gui. You had to open a terminal, go to .zim and use git or hg by hand. And yeah, specify commit messages. This is not a software project. It's very unlikly I'm going to revert something. Adding a commit message is just dublicating my text, because my note was 4 words long.