summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-21 12:49:08 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-21 12:49:08 -0700
commit1ddb4d7e5ed478ec7a0335090482c1944a64aca5 (patch)
treef7d259210d2148375b7a59138f71d92b67d6196f /Documentation
parent6dada01b95a48f8ea0eeec53d2eb4a8c894aff91 (diff)
parentb790e0f67cd97f29b72cb9007632b0329e5eebec (diff)
downloadgit-1ddb4d7e5ed478ec7a0335090482c1944a64aca5.tar.gz
Merge branch 'nd/upload-pack-shallow'
Serving objects from a shallow repository needs to write a temporary file to be used, but the serving upload-pack may not have write access to the repository which is meant to be read-only. Instead feed these temporary shallow bounds from the standard input of pack-objects so that we do not have to use a temporary file. * nd/upload-pack-shallow: upload-pack: send shallow info over stdin to pack-objects
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-pack-objects.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index cdab9ed503..d2d8f4792a 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -64,6 +64,8 @@ base-name::
the same way as 'git rev-list' with the `--objects` flag
uses its `commit` arguments to build the list of objects it
outputs. The objects on the resulting list are packed.
+ Besides revisions, `--not` or `--shallow <SHA-1>` lines are
+ also accepted.
--unpacked::
This implies `--revs`. When processing the list of