The point I am trying to make is that all "productivity aids" have a learning curve and will require time spent "messing around" before they confer any benefit.

In my experience, once you understand how git works it gets out of your way entirely.