Merge branch 'tf/cleanup-builtin-help-headers'

* tf/cleanup-builtin-help-headers:
builtin.h: Move two functions definitions to help.h.

diff --combined git.c
index ce4bcfec03bb4371d01b3f39bf93764eda337ce7,795f75e56d2584b13bc39bcf77779af1ec3bc46c..50a14013c5a87fed200df0a5a4ec6db0f1e2c223
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -1,6 -1,7 +1,7 @@@
  #include "builtin.h"
- #include "exec_cmd.h"
  #include "cache.h"
+ #include "exec_cmd.h"
+ #include "help.h"
  #include "quote.h"
  #include "run-command.h"
  
@@@ -56,6 -57,9 +57,6 @@@ static int handle_options(const char **
  {
        int handled = 0;
  
 -      if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS"))
 -              setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1);
 -
        while (*argc > 0) {
                const char *cmd = (*argv)[0];
                if (cmd[0] != '-')
@@@ -134,7 -138,7 +135,7 @@@
                                fprintf(stderr, "-c expects a configuration string\n" );
                                usage(git_usage_string);
                        }
 -                      git_config_parse_parameter((*argv)[1]);
 +                      git_config_push_parameter((*argv)[1]);
                        (*argv)++;
                        (*argc)--;
                } else {