Changes only needed in cmdline.c for TortoiseGit, marked with "// TortoiseGit"