From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 03 Dec 2010 14:57:12 GMT
Subject: Re: [PATCH] git-pull.txt: Mention branch.autosetuprebase
Message-ID: <m3k4jq3nxo.fsf@localhost.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