Introduce the config variable pack.packSizeLimit

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 77fdaf146eaa20327b0830ac69a6cc6b3e8f9797..4cc633a5ec4c449e98ac9cb16fd125da6d336798 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -25,6 +25,7 @@ OPTIONS
 -------
 include::merge-options.txt[]
 
+:git-pull: 1
 include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
@@ -34,7 +35,11 @@ include::urls-remotes.txt[]
 include::merge-strategies.txt[]
 
 \--rebase::
-       Instead of a merge, perform a rebase after fetching.
+       Instead of a merge, perform a rebase after fetching.  If
+       there is a remote ref for the upstream branch, and this branch
+       was rebased since last fetched, the rebase uses that information
+       to avoid rebasing non-local changes.
+
        *NOTE:* This is a potentially _dangerous_ mode of operation.
        It rewrites history, which does not bode well when you
        published that history already.  Do *not* use this option