diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:19 -0800 |
commit | 53b2a5ff30cde96c5d62f60600996a0a95847842 (patch) | |
tree | e7b1e93f7654832e50bf052e69329a93a8d8bcd6 /Documentation | |
parent | Merge branch 'tg/diff-no-index-refactor' (diff) | |
parent | pack-objects doc: treat output filename as opaque (diff) | |
download | tgif-53b2a5ff30cde96c5d62f60600996a0a95847842.tar.xz |
Merge branch 'jk/name-pack-after-byte-representation'
Two packfiles that contain the same set of objects have
traditionally been named identically, but that made repacking a
repository that is already fully packed without any cruft with a
different packing parameter cumbersome. Update the convention to
name the packfile after the bytestream representation of the data,
not after the set of objects in it.
* jk/name-pack-after-byte-representation:
pack-objects doc: treat output filename as opaque
pack-objects: name pack files after trailer hash
sha1write: make buffer const-correct
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-pack-objects.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index d94edcd4b4..cdab9ed503 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -51,8 +51,7 @@ base-name:: <base-name> to determine the name of the created file. When this option is used, the two files are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash - of the sorted object names to make the resulting filename - based on the pack content, and written to the standard + based on the pack content and is written to the standard output of the command. --stdout:: |