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

3 messages from 2010-12-03 to 2010-12-03. Participants: jari.aalto@cante.net, Jakub Narebski, Junio C Hamano.
Thread: https://gitlist.dev/t/25934

## jari.aalto@cante.net, 2010-12-03 08:20

Subject: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Message-ID: <1291364454-9849-1-git-send-email-jari.aalto@cante.net>
URL: https://gitlist.dev/e/1291364454-9849-1-git-send-email-jari.aalto%40cante.net

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

In "Options related to merging" mention also related option
branch.autosetuprebase in git-config(1).

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

```

## Jakub Narebski, 2010-12-03 14:57

Subject: Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Message-ID: <m3k4jq3nxo.fsf@localhost.localdomain>
URL: https://gitlist.dev/e/m3k4jq3nxo.fsf%40localhost.localdomain
In-Reply-To: <1291364454-9849-1-git-send-email-jari.aalto@cante.net>

```
jari.aalto@cante.net writes:

> From: Jari Aalto <jari.aalto@cante.net>
> 
> In "Options related to merging" mention also related option
> branch.autosetuprebase in git-config(1).
> 
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---

> -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.

Good catch.  Thanks.
-- 
Jakub Narebski
Poland
ShadeHawk on #git

```

## Junio C Hamano, 2010-12-03 19:36

Subject: Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Message-ID: <7v1v5yps12.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7v1v5yps12.fsf%40alter.siamese.dyndns.org
In-Reply-To: <1291364454-9849-1-git-send-email-jari.aalto@cante.net>

```
jari.aalto@cante.net writes:

> From: Jari Aalto <jari.aalto@cante.net>
>
> In "Options related to merging" mention also related option
> branch.autosetuprebase in git-config(1).
>
> 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.

Thanks; will queue.

```