Merge branch 'ah/pack-objects-usage-strings'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2015 23:31:12 +0000 (16:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Sep 2015 23:31:12 +0000 (16:31 -0700)
Usage string fix.

* ah/pack-objects-usage-strings:
  pack-objects: place angle brackets around placeholders in usage strings

1  2 
builtin/pack-objects.c

  #include "refs.h"
  #include "streaming.h"
  #include "thread-utils.h"
 +#include "pack-bitmap.h"
 +#include "reachable.h"
 +#include "sha1-array.h"
 +#include "argv-array.h"
  
  static const char *pack_usage[] = {
-       N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
-       N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
+       N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
+       N_("git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"),
        NULL
  };