Add ability to support different versions of git.

This is important as the configurations for different versions of
git is not necessarily compatible and this configuration is shared
among several computers.

This also takes advantage of the new git feature that allows one
configuration file include another configuration file.
Change git track-named-branch to use new version of set-upstream-to arg.