[PATCH] git-pull.txt: Mention branch.autosetuprebase

From

jari.aalto@cante.net <jari.aalto@cante.net>

Date

Dec 3, 2010, 08:20 UTC

Message-ID

<1291364454-9849-1-git-send-email-jari.aalto@cante.net>

From: Jari Aalto <jari.aalto@cante.net>

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 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 e47361f..7b4caac 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.

-- 
1.7.2.3