diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:14 +0900 |
| commit | 8f1119b988199dd69473c8ac4f9cafa27bff1e52 (patch) | |
| tree | 36137574c7ce5e6c805061d656eeeed4323161b1 /Documentation | |
| parent | Merge branch 'en/merge-recursive-directory-rename-fixes' (diff) | |
| parent | multi-pack-index: add [--[no-]progress] option. (diff) | |
| download | tgif-8f1119b988199dd69473c8ac4f9cafa27bff1e52.tar.xz | |
Merge branch 'wb/midx-progress'
The code to generate multi-pack index learned to show (or not to
show) progress indicators.
* wb/midx-progress:
multi-pack-index: add [--[no-]progress] option.
midx: honor the MIDX_PROGRESS flag in midx_repack
midx: honor the MIDX_PROGRESS flag in verify_midx_file
midx: add progress to expire_midx_packs
midx: add progress to write_midx_file
midx: add MIDX_PROGRESS flag
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-multi-pack-index.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt index 233b2b7862..642d9ac5b7 100644 --- a/Documentation/git-multi-pack-index.txt +++ b/Documentation/git-multi-pack-index.txt @@ -9,7 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes SYNOPSIS -------- [verse] -'git multi-pack-index' [--object-dir=<dir>] <subcommand> +'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress] <subcommand> DESCRIPTION ----------- @@ -23,6 +23,10 @@ OPTIONS `<dir>/packs/multi-pack-index` for the current MIDX file, and `<dir>/packs` for the pack-files to index. +--[no-]progress:: + Turn progress on/off explicitly. If neither is specified, progress is + shown if standard error is connected to a terminal. + The following subcommands are available: write:: |