From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Apr 2008 07:29:33 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.1~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=179c94b24ae87e28328f9b311489417b66bd62c9;p=git.git

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

179c94b24ae87e28328f9b311489417b66bd62c9
diff --cc parse-options.c
index e87cafbe4,59dc9ce6b..acf3fe3a1
--- a/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;