bump:git fix

Use + instead of - to separate git version. Replace existing git version if present. Don’t concat gitVersion on multiple files.