Geany mainly on Linux but also on Windows (but not much as I only fix Windows specific issues in my code on Windows and do most of my work on Linux). I use my own PyGTK GUI wrapper for git for source management. Peter