New git completion settings some explanations about subs.
Conflicts resolved