diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-09 15:41:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-09 15:41:20 -0800 |
| commit | 515ab1d542801aea6a6119c0391ef91dbc9e9de9 (patch) | |
| tree | cfcad3b4d1f63c5d1c5c8752e507cc4f9db59207 /git-pull.txt | |
| parent | 92887a3ed176ab77bfc12e91914f1cdd99e591d6 (diff) | |
| download | git-htmldocs-515ab1d542801aea6a6119c0391ef91dbc9e9de9.tar.gz | |
Autogenerated HTML docs for v1.7.8-163-g9859a
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index e1da46876..0f18ec891 100644 --- a/git-pull.txt +++ b/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.<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. + |