mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: Documentation/pack-format.txt: Clear up description of types. fix typo in git-am manpage
This commit is contained in:
commit
aa576e6b47
|
@ -70,7 +70,7 @@ default. You could use `--no-utf8` to override this.
|
||||||
the patch.
|
the patch.
|
||||||
|
|
||||||
-C<n>, -p<n>::
|
-C<n>, -p<n>::
|
||||||
These flag are passed to the `git-apply` program that applies
|
These flags are passed to the `git-apply` program that applies
|
||||||
the patch.
|
the patch.
|
||||||
|
|
||||||
--interactive::
|
--interactive::
|
||||||
|
|
|
@ -21,11 +21,11 @@ GIT pack format
|
||||||
which looks like this:
|
which looks like this:
|
||||||
|
|
||||||
(undeltified representation)
|
(undeltified representation)
|
||||||
n-byte type and length (4-bit type, (n-1)*7+4-bit length)
|
n-byte type and length (3-bit type, (n-1)*7+4-bit length)
|
||||||
compressed data
|
compressed data
|
||||||
|
|
||||||
(deltified representation)
|
(deltified representation)
|
||||||
n-byte type and length (4-bit type, (n-1)*7+4-bit length)
|
n-byte type and length (3-bit type, (n-1)*7+4-bit length)
|
||||||
20-byte base object name
|
20-byte base object name
|
||||||
compressed delta data
|
compressed delta data
|
||||||
|
|
||||||
|
@ -102,11 +102,13 @@ trailer | | packfile checksum |
|
||||||
Pack file entry: <+
|
Pack file entry: <+
|
||||||
|
|
||||||
packed object header:
|
packed object header:
|
||||||
1-byte type (upper 4-bit)
|
1-byte size extension bit (MSB)
|
||||||
|
type (next 3 bit)
|
||||||
size0 (lower 4-bit)
|
size0 (lower 4-bit)
|
||||||
n-byte sizeN (as long as MSB is set, each 7-bit)
|
n-byte sizeN (as long as MSB is set, each 7-bit)
|
||||||
size0..sizeN form 4+7+7+..+7 bit integer, size0
|
size0..sizeN form 4+7+7+..+7 bit integer, size0
|
||||||
is the most significant part.
|
is the least significant part, and sizeN is the
|
||||||
|
most significant part.
|
||||||
packed object data:
|
packed object data:
|
||||||
If it is not DELTA, then deflated bytes (the size above
|
If it is not DELTA, then deflated bytes (the size above
|
||||||
is the size before compression).
|
is the size before compression).
|
||||||
|
|
Loading…
Reference in a new issue