X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=756909cb10f62c44321653bfd5c32fc306c60653;hb=6b37dff17f176d7e87efa93b4cf521dd725de247;hp=14609cbd4dc2f7f3c16f7b660e4aff76eca6065b;hpb=05318994e7fcb6a652a8329bf7ba7f8d6696ee3c;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 14609cbd4..756909cb1 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..rebase` and `branch.autosetuprebase` in +See `pull.rebase`, `branch..rebase` and `branch.autosetuprebase` in linkgit:git-config[1] if you want to make `git pull` always use `{litdd}rebase` instead of merging. +