diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 18:48:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 18:48:38 (GMT) |
| commit | 7f20008d14e3eececdc90c75d3a86ee6c250cb67 (patch) | |
| tree | 3a6d3d114ba58c45496cb456e01cd5945c3b1b34 /Documentation | |
| parent | 5234b41f68ca1ab788513fdc059f9f2e01fd3f6e (diff) | |
| parent | 04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff) | |
| download | git-7f20008d14e3eececdc90c75d3a86ee6c250cb67.zip git-7f20008d14e3eececdc90c75d3a86ee6c250cb67.tar.gz git-7f20008d14e3eececdc90c75d3a86ee6c250cb67.tar.bz2 | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/pack-format.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt index 0e37ec9..a37f137 100644 --- a/Documentation/technical/pack-format.txt +++ b/Documentation/technical/pack-format.txt @@ -26,7 +26,9 @@ Git pack format (deltified representation) n-byte type and length (3-bit type, (n-1)*7+4-bit length) - 20-byte base object name + 20-byte base object name if OBJ_REF_DELTA or a negative relative + offset from the delta object's position in the pack if this + is an OBJ_OFS_DELTA object compressed delta data Observation: length of each object is encoded in a variable |