Merge branch 'jc/daemon-no-ipv6-for-2.4.1'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 4064452b066ef91a900c3e602448d2c67d7ab75d..712ab4baed2c6802ddd96681f11c7f05a436f48b 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -116,7 +116,7 @@ to `git rebase` so that locally created merge commits will not be flattened.
 +
 When false, merge the current branch into the upstream branch.
 +
-See `pull.rebase`, `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
 `--rebase` instead of merging.
 +