Merge branch 'tb/commit-graph-usage-fix'

Regression in "git commit-graph" command line parsing has been
corrected.

* tb/commit-graph-usage-fix:
  builtin/multi-pack-index.c: disable top-level --[no-]progress
  builtin/commit-graph.c: don't accept common --[no-]progress

diff --cc Documentation/git-multi-pack-index.txt
index a9df3dbd328f77d922420d8d0c8c697acb6d9d99,5ba4bd516625aa6e24016a54b748fcb18ece9360..3b0b55cd7555e0e4c418dc361d4697665b1ff99b
--- 1/Documentation/git-multi-pack-index.txt
--- 2/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@@ -9,8 -9,7 +9,7 @@@ git-multi-pack-index - Write and verif
  SYNOPSIS
  --------
  [verse]
- 'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
-       [--preferred-pack=<pack>] [--[no-]bitmap] <subcommand>
 -'git multi-pack-index' [--object-dir=<dir>] <sub-command>
++'git multi-pack-index' [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
  
  DESCRIPTION
  -----------

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/multi-pack-index.c
index 66de6efd413d3cf5fe4b5c793764df9ba34c93ea,5f11a3067da392379fc52afaebbe72f81f8ccf01..0fb2439b0f403fc384e2be8bf66334dbe10ebd77
--- 1/builtin/multi-pack-index.c
--- 2/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@@ -68,8 -67,8 +67,10 @@@ static int cmd_multi_pack_index_write(i
                OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
                           N_("preferred-pack"),
                           N_("pack for reuse when computing a multi-pack bitmap")),
 +              OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
 +                      MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
+               OPT_BIT(0, "progress", &opts.flags,
+                       N_("force progress reporting"), MIDX_PROGRESS),
                OPT_END(),
        };
  

diff --cc t/t5319-multi-pack-index.sh
Simple merge