Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:29:33 +0000 (00:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:29:33 +0000 (00:29 -0700)
* maint-1.5.4:
  core-tutorial.txt: Fix showing the current behaviour.
  git-archive: ignore prefix when checking file attribute
  Fix documentation syntax of optional arguments in short options.

1  2 
Documentation/git-tag.txt
builtin-tag.c
parse-options.c

Simple merge
diff --cc builtin-tag.c
Simple merge
diff --cc parse-options.c
@@@ -340,11 -328,9 +340,11 @@@ void usage_with_options_internal(const 
                        pos += fprintf(stderr, "--%s", opts->long_name);
  
                switch (opts->type) {
 +              case OPTION_ARGUMENT:
 +                      break;
                case OPTION_INTEGER:
                        if (opts->flags & PARSE_OPT_OPTARG)
-                               pos += fprintf(stderr, " [<n>]");
+                               pos += fprintf(stderr, "[<n>]");
                        else
                                pos += fprintf(stderr, " <n>");
                        break;