diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:10 -0700 |
| commit | 5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch) | |
| tree | 1960d9d9011cb728631b357c928745b42d096eda /Documentation/user-manual.txt | |
| parent | git-svn: avoid string eval for defining functions (diff) | |
| parent | GIT 1.5.2.2 (diff) | |
| download | tgif-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.xz | |
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 0bfa21b3d2..ff7c71d4fb 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested independently of the contents or the type of the object: all objects can be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that -forms a sequence of <ascii type without space> + <space> + <ascii decimal -size> + <byte\0> + <binary object data>. +forms a sequence of <ascii type without space> {plus} <space> {plus} <ascii decimal +size> {plus} <byte\0> {plus} <binary object data>. The structured objects can further have their structure and connectivity to other objects verified. This is generally done with |