From: Junio C Hamano Date: Fri, 31 Jul 2020 04:34:32 +0000 (-0700) Subject: Merge branch 'jb/doc-packfile-name' into master X-Git-Tag: v2.29.0-rc0~200 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d61aed07bd0c61420879f42b4b961785ed1f742a;p=thirdparty%2Fgit.git Merge branch 'jb/doc-packfile-name' into master Doc update. * jb/doc-packfile-name: pack-write/docs: update regarding pack naming --- d61aed07bd0c61420879f42b4b961785ed1f742a diff --cc Documentation/git-index-pack.txt index 9316d9a80b,b89a5517e5..ac74d058e0 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@@ -90,22 -87,12 +90,22 @@@ OPTION Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads. +--max-input-size=:: + Die, if the pack is larger than . -Note ----- +--object-format=:: + Specify the given object format (hash algorithm) for the pack. The valid + values are 'sha1' and (if enabled) 'sha256'. The default is the algorithm for + the current repository (set by `extensions.objectFormat`), or 'sha1' if no + value is set or outside a repository. ++ +This option cannot be used with --stdin. + +NOTES +----- - Once the index has been created, the list of object names is sorted - and the SHA-1 hash of that list is printed to stdout. If --stdin was + Once the index has been created, the hash that goes into the name of + the pack/idx file is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a .keep file used as a lock to prevent the race with 'git repack'