Yup: emacs for editing org-mode files but git for sync.