Replace uses of "git-var" with "git var"