Merge branch 'master' into development

Author: DRSDavidSoft

vendor/git-prompt.sh

@@ -1,3 +1,4 @@
+# Returns 1 if git status for Cmder is disabled, otherwise returns 0
 function getGitStatusSetting() {
   local gitConfig
 
@@ -92,4 +93,4 @@ then
     test ! -f "$c" ||
     . "$c"
   done
-fi
+fi