Merge branch 'tc/curl-with-backports' into next

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index b201af6f19b5d137e010dd9a25d746c7d9031007..ce05b7a5b13eadb6870f16a7168559434d376c20 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -131,7 +131,7 @@ unless you have read linkgit:git-rebase[1] carefully.
 --autostash::
 --no-autostash::
        Before starting rebase, stash local modifications away (see
-       linkgit:git-stash[1]) if needed, and apply the stash when
+       linkgit:git-stash[1]) if needed, and apply the stash entry when
        done. `--no-autostash` is useful to override the `rebase.autoStash`
        configuration variable (see linkgit:git-config[1]).
 +