summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 14609cb..756909c 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -107,7 +107,7 @@ 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.
+