Merge branch 'ak/git-done-help-cleanup'

Code simplification.

* ak/git-done-help-cleanup:
git: make was_alias and done_help non-static

diff --combined git.c
index 8c7ee9c83000765afa3808f3dd0941aa484ca1ec,29268d2f8e528a49db89f880c2ce7dab4f6d4b71..8b5659b2086a2716b8978b2a57bbdc0d7ff5124a
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -6,7 -6,7 +6,7 @@@
  const char git_usage_string[] =
        "git [--version] [--help] [-C <path>] [-c name=value]\n"
        "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
 -      "           [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]\n"
 +      "           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
        "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
        "           <command> [<args>]";
  
@@@ -618,6 -618,7 +618,7 @@@ int main(int argc, char **av
  {
        const char **argv = (const char **) av;
        const char *cmd;
+       int done_help = 0;
  
        startup_info = &git_startup_info;
  
@@@ -680,9 -681,7 +681,7 @@@
        setup_path();
  
        while (1) {
-               static int done_help = 0;
-               static int was_alias = 0;
-               was_alias = run_argv(&argc, &argv);
+               int was_alias = run_argv(&argc, &argv);
                if (errno != ENOENT)
                        break;
                if (was_alias) {