From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 03 Dec 2010 19:36:57 GMT
Subject: Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Message-ID: <7v1v5yps12.fsf@alter.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.