Merge branch 'maint'

diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index 913b75bb8d03f74e514037cff249450ee2685fcc..3e6cd880b0e6aeda3056da1361ffcae52b89b531 100644 (file)
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt
@@ -3,7 +3,7 @@ git-fetch-pack(1)
 
 NAME
 ----
-git-fetch-pack - Receive missing objects from another repository.
+git-fetch-pack - Receive missing objects from another repository
 
 
 SYNOPSIS
@@ -32,7 +32,8 @@ OPTIONS
 -k::
        Do not invoke 'git-unpack-objects' on received data, but
        create a single packfile out of it instead, and store it
-       in the object database.
+       in the object database. If provided twice then the pack is
+       locked against repacking.
 
 --exec=<git-upload-pack>::
        Use this to specify the path to 'git-upload-pack' on the