diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-13 08:31:58 +0000 |
| commit | eef01fe919cb245838e4f4ad512a66202747742e (patch) | |
| tree | 02c72b987c74aadbce61763a2e2772bde48b416a /git-pull.txt | |
| parent | cf29d337e34d752e5b61fc6629294eccc3ff6ef3 (diff) | |
| download | git-htmldocs-eef01fe919cb245838e4f4ad512a66202747742e.tar.gz | |
Autogenerated HTML docs for v1.7.3.3-557-gb5c17
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt index 4db73737b..30466917d 100644 --- a/git-pull.txt +++ b/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. |