From c4f4157ee84ff27dd7a398f80002be59eb2f69e7 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Fri, 3 Dec 2010 10:20:54 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-pull.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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..rebase` in linkgit:git-config[1] if you want to make -`git pull` always use `{litdd}rebase` instead of merging. +See `branch..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. -- 2.30.2