summaryrefslogtreecommitdiff
path: root/parse-options.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-10 00:29:33 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-10 00:29:33 -0700
commit179c94b24ae87e28328f9b311489417b66bd62c9 (patch)
tree3458de6031a61992cf96700826c29096867cae43 /parse-options.c
parent1d2375ddfee18bd3effd2c1f98527cc2f8b1df0a (diff)
parentabea85d1e9ee0bd77e41e934534aa5d5cdd0593a (diff)
downloadgit-179c94b24ae87e28328f9b311489417b66bd62c9.tar.gz
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.
Diffstat (limited to 'parse-options.c')
-rw-r--r--parse-options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c
index e87cafbe41..acf3fe3a1a 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -344,7 +344,7 @@ void usage_with_options_internal(const char * const *usagestr,
break;
case OPTION_INTEGER:
if (opts->flags & PARSE_OPT_OPTARG)
- pos += fprintf(stderr, " [<n>]");
+ pos += fprintf(stderr, "[<n>]");
else
pos += fprintf(stderr, " <n>");
break;