diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:36:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:36:23 -0800 |
| commit | b69fb7866b24b205a876a6a0b256c786a58419c7 (patch) | |
| tree | 3c26bb515502f2986ec22af212e8c660845e8ae9 /Documentation | |
| parent | Merge branch 'tc/http-urls-ends-with-slash' into maint (diff) | |
| parent | git-pull.txt: Mention branch.autosetuprebase (diff) | |
| download | tgif-b69fb7866b24b205a876a6a0b256c786a58419c7.tar.xz | |
Merge branch 'ja/maint-pull-rebase-doc' into maint
* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index abbc3eb3e0..64009dee31 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.<name>.rebase` in linkgit:git-config[1] if you want to make -`git pull` always use `{litdd}rebase` instead of merging. +See `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. + [NOTE] This is a potentially _dangerous_ mode of operation. |