I really enjoyed using CherryTree on top of Git with automatic commit and sync. Getting readable diffs (via using XML as an output format) is meaningful.