From: Jari Aalto <jari.aalto@cante.net>
Date: Fri, 3 Dec 2010 08:20:54 +0000 (+0200)
Subject: git-pull.txt: Mention branch.autosetuprebase
X-Git-Tag: v1.7.3.4~9^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4f4157ee84ff27dd7a398f80002be59eb2f69e7;p=git.git

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>
---

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e1b0bd286..765fbebc2 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.