builtin-apply.c: do not feed copy_wsfix() leading '+'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index f9f1e0d30b5ba9842d5071d3d3fba3599cd96ebf..4cc633a5ec4c449e98ac9cb16fd125da6d336798 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -35,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