Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index e243d9d22ea90603f0ed7754e943763055fe4bbd..c7e600db4745c80fddcb14986bc192d80630aa51 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -11,10 +11,9 @@
 #include "exec_cmd.h"
 
 static const char index_pack_usage[] =
-"git index-pack [-v] [-o <index-file>] [{ --keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";
+"git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
 
-struct object_entry
-{
+struct object_entry {
        struct pack_idx_entry idx;
        unsigned long size;
        unsigned int hdr_size;
@@ -44,8 +43,7 @@ struct base_data {
 #define FLAG_LINK (1u<<20)
 #define FLAG_CHECKED (1u<<21)
 
-struct delta_entry
-{
+struct delta_entry {
        union delta_base base;
        int obj_no;
 };