diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 4db73737b0..30466917da 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -98,8 +98,9 @@ include::merge-options.txt[] fetched, the rebase uses that information to avoid rebasing non-local changes. + -See `branch..rebase` in linkgit:git-config[1] if you want to make -`git pull` always use `{litdd}rebase` instead of merging. +See `branch..rebase` and `branch.autosetuprebase` in +linkgit:git-config[1] if you want to make `git pull` always use +`{litdd}rebase` instead of merging. + [NOTE] This is a potentially _dangerous_ mode of operation.