diff options
| author |  Jari Aalto <jari.aalto@cante.net> | 2010-12-03 10:20:54 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-12-03 11:16:45 -0800 |
| commit | c4f4157ee84ff27dd7a398f80002be59eb2f69e7 (patch) | |
| tree | 6773d1e0f9baa7b639c9e1c75410394c4194a1b8 /Documentation | |
| parent | Prepare for 1.7.3.3 (diff) | |
| download | tgif-c4f4157ee84ff27dd7a398f80002be59eb2f69e7.tar.xz | |
git-pull.txt: Mention branch.autosetuprebase
In "Options related to merging" mention also related option
branch.autosetuprebase in git-config(1).
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e1b0bd2868..765fbebc2e 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. |