Merge branch 'maint-1.5.4' into maint

* 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.

diff --cc Documentation/git-tag.txt
Simple merge

diff --cc builtin-tag.c
Simple merge

diff --cc parse-options.c
index e87cafbe4199acb39fd9113e4b5096de19a3a61c,59dc9ce6b471c61aff22d51293ee3d74b020c88a..acf3fe3a1a82cd99e7bd6e0ff9d6d3d7e344a155
--- 1/parse-options.c
--- 2/parse-options.c
+++ b/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;