sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index f0ef7d02a5dc6c40eb9aab706e0c43f467b3f8a6..92c68c3fdabafd9ac5afe74256dbd2d56218c247 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -14,8 +14,18 @@
        branch history. Tags for the deepened commits are not fetched.
 
 --unshallow::
-       Convert a shallow repository to a complete one, removing all
-       the limitations imposed by shallow repositories.
+       If the source repository is complete, convert a shallow
+       repository to a complete one, removing all the limitations
+       imposed by shallow repositories.
++
+If the source repository is shallow, fetch as much as possible so that
+the current repository has the same history as the source repository.
+
+--update-shallow::
+       By default when fetching from a shallow repository,
+       `git fetch` refuses refs that require updating
+       .git/shallow. This option updates .git/shallow and accept such
+       refs.
 
 ifndef::git-pull[]
 --dry-run::