diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 13:25:20 -0700 |
| commit | dec040192fde87fb3249a3d53f802decd84fa7b7 (patch) | |
| tree | 7c73c3807033b62c98368ff2d3ca8ecbf20177b9 /Documentation | |
| parent | Merge branch 'nd/commit-p-doc' (diff) | |
| parent | alternates: use fspathcmp to detect duplicates (diff) | |
| download | tgif-dec040192fde87fb3249a3d53f802decd84fa7b7.tar.xz | |
Merge branch 'jk/alt-odb-cleanup'
Codepaths involved in interacting alternate object store have
been cleaned up.
* jk/alt-odb-cleanup:
alternates: use fspathcmp to detect duplicates
sha1_file: always allow relative paths to alternates
count-objects: report alternates via verbose mode
fill_sha1_file: write into a strbuf
alternates: store scratch buffer as strbuf
fill_sha1_file: write "boring" characters
alternates: use a separate scratch space
alternates: encapsulate alt->base munging
alternates: provide helper for allocating alternate
alternates: provide helper for adding to alternates list
link_alt_odb_entry: refactor string handling
link_alt_odb_entry: handle normalize_path errors
t5613: clarify "too deep" recursion tests
t5613: do not chdir in main process
t5613: whitespace/style cleanups
t5613: use test_must_fail
t5613: drop test_valid_repo function
t5613: drop reachable_via function
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-count-objects.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt index 2ff35683e5..cb9b4d2e46 100644 --- a/Documentation/git-count-objects.txt +++ b/Documentation/git-count-objects.txt @@ -38,6 +38,11 @@ objects nor valid packs + size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified) ++ +alternate: absolute path of alternate object databases; may appear +multiple times, one line per path. Note that if the path contains +non-printable characters, it may be surrounded by double-quotes and +contain C-style backslashed escape sequences. -H:: --human-readable:: |