changing to nested version
Began work to increase nesting - make the function able to back out if
there's a problem.
git-config doesn't have separate settings for different branches.