diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:43 -0700 |
| commit | cc93020f5213b589ff1e512185c47d8c38a4b994 (patch) | |
| tree | 8579bcd4fb9b969cfebb835c1ddabcff0b388d67 /Documentation | |
| parent | a0f5b7f0170629107a4aa37a6485cf1263d2b802 (diff) | |
| parent | 726f852b0ed7e03e88c419a9996c3815911c9db1 (diff) | |
| download | git-cc93020f5213b589ff1e512185c47d8c38a4b994.tar.gz git-cc93020f5213b589ff1e512185c47d8c38a4b994.tar.xz | |
Merge branch 'np/pack'
* np/pack:
deprecate the new loose object header format
make "repack -f" imply "pack-objects --no-reuse-object"
allow for undeltified objects not to be reused
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 13 | ||||
| -rw-r--r-- | Documentation/git-pack-objects.txt | 7 |
2 files changed, 7 insertions, 13 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index efcf3019b..b8d48d101 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -209,19 +209,6 @@ core.compression:: compression, and 1..9 are various speed/size tradeoffs, 9 being slowest. -core.legacyheaders:: - A boolean which - changes the format of loose objects so that they are more - efficient to pack and to send out of the repository over git - native protocol, since v1.4.2. However, loose objects - written in the new format cannot be read by git older than - that version; people fetching from your repository using - older versions of git over dumb transports (e.g. http) - will also be affected. -+ -To let git use the new loose object format, you have to -set core.legacyheaders to false. - core.packedGitWindowSize:: Number of bytes of a pack file to map into memory in a single mapping operation. Larger window sizes may allow diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index bd3ee456e..ce892147d 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -127,6 +127,13 @@ base-name:: This flag tells the command not to reuse existing deltas but compute them from scratch. +--no-reuse-object:: + This flag tells the command not to reuse existing object data at all, + including non deltified object, forcing recompression of everything. + This implies --no-reuse-delta. Useful only in the obscur case where + wholesale enforcement of a different compression level on the + packed data is desired. + --delta-base-offset:: A packed archive can express base object of a delta as either 20-byte object name or as an offset in the |