summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2010-12-03 10:20:54 +0200
committerJunio C Hamano <gitster@pobox.com>2010-12-03 11:16:45 -0800
commitc4f4157ee84ff27dd7a398f80002be59eb2f69e7 (patch)
tree6773d1e0f9baa7b639c9e1c75410394c4194a1b8 /Documentation/git-pull.txt
parent7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e (diff)
downloadgit-c4f4157ee84ff27dd7a398f80002be59eb2f69e7.tar.gz
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/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt5
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.