From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Sep 2015 23:31:12 +0000 (-0700)
Subject: Merge branch 'ah/pack-objects-usage-strings'
X-Git-Tag: v2.6.0-rc0~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8746e30541dbb3e5f68f55519a3f961b0fe09e97

Merge branch 'ah/pack-objects-usage-strings'

Usage string fix.

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

8746e30541dbb3e5f68f55519a3f961b0fe09e97
diff --cc builtin/pack-objects.c
index 62cc16ddc2,06884c2a57..1c63f8f28c
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -19,14 -18,10 +19,14 @@@
  #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
  };