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>
Jari Aalto committed
Dec 3, 2010 at 10:20 UTC
c4f4157ee84ff27dd7a398f80002be59eb2f69e7
1 file changed
+3
-2
Documentation/git-pull.txt
+3
-2
@@ -98,8 +98,9 @@ include::merge-options.txt[]
98
fetched, the rebase uses that information to avoid rebasing
99
non-local changes.
100
+
101
-See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
102
-`git pull` always use `{litdd}rebase` instead of merging.
101
+See `branch.<name>.rebase` and `branch.autosetuprebase` in
102
+linkgit:git-config[1] if you want to make `git pull` always use
103
+`{litdd}rebase` instead of merging.
104
+
105
[NOTE]
106
This is a potentially _dangerous_ mode of operation.