summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
commitb5c178143088350c49129acbedb864d70c666215 (patch)
tree0700cd77ab20d235cd94dab11280f7ac7e40c450 /Documentation
parentMerge branch 'gb/web--browse' (diff)
parentgit-pull.txt: Mention branch.autosetuprebase (diff)
downloadtgif-b5c178143088350c49129acbedb864d70c666215.tar.xz
Merge branch 'ja/maint-pull-rebase-doc'
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
Diffstat (limited to 'Documentation')
-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 4db73737b0..30466917da 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.