index-pack: use streaming interface for collision test on large blobs

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e1da46876682e9d95a7505e1bc116cbe07f2ec61..defb544ed0af407a2e6360355bad34b1cb43fed9 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -108,9 +108,9 @@ include::merge-options.txt[]
        fetched, the rebase uses that information to avoid rebasing
        non-local changes.
 +
-See `branch.<name>.rebase` and `branch.autosetuprebase` in
+See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
 linkgit:git-config[1] if you want to make `git pull` always use
-`{litdd}rebase` instead of merging.
+`--rebase` instead of merging.
 +
 [NOTE]
 This is a potentially _dangerous_ mode of operation.