diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 16:07:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 16:07:30 -0800 |
| commit | c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319 (patch) | |
| tree | 637f16f49f172a279356b66fd2445f8db69515bf /Documentation | |
| parent | 859c4fbef589841585f8f21cc567b7016681df7a (diff) | |
| parent | 5f4347bba39ddb147b06913ac263fc46954d2d0b (diff) | |
| download | git-c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319.tar.gz git-c0b48ad777eb8ad42d8d0eafc8f0ee82955b1319.tar.xz | |
Merge branch 'np/verify-pack'
* np/verify-pack:
add storage size output to 'git verify-pack -v'
fix unimplemented packed_object_info_detail() features
make verify_one_pack() a bit less wrong wrt packed_git structure
factorize revindex code out of builtin-pack-objects.c
Conflicts:
Makefile
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-verify-pack.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index db019a2b8..ba2a15729 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -32,11 +32,11 @@ OUTPUT FORMAT ------------- When specifying the -v option the format used is: - SHA1 type size offset-in-packfile + SHA1 type size size-in-pack-file offset-in-packfile for objects that are not deltified in the pack, and - SHA1 type size offset-in-packfile depth base-SHA1 + SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1 for objects that are deltified. |