X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=0f18ec891ac75effb102a445a93bdcf4432bb697;hb=0dbe6592ccbd1a394a69a52074e3729d546fe952;hp=e1da46876682e9d95a7505e1bc116cbe07f2ec61;hpb=f0b4fd47074d8cf3f9db9c444c8e1e125e0cc517;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1da46876..0f18ec891 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -108,7 +108,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. +