I would recommend personal wiki such as ZIM. It comes with diary, todo lists, git integration... They also have similar guide:

http://zim-wiki.org/manual/Usage/Getting_Things_Done.html