ParentFull threadworkethics·Kallithea[0] has support for both. You might want to test it out and see if it's a good fit for your setup. I enjoyed working with it when when I used it.[0]https://kallithea-scm.org/View on HN