From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mon, 30 Mar 2009 10:35:10 GMT
Subject: Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
Message-ID: <49D0A05E.7060708@drmicha.warpmail.net>
In-Reply-To: <1238407903-28020-4-git-send-email-santi@agolina.net>

Santi Béjar venit, vidit, dixit 30.03.2009 12:11:
> 
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
>  Documentation/config.txt |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 7ae584f..38ab785 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -480,7 +480,7 @@ branch.<name>.remote::
>  branch.<name>.merge::
>  	It defines, together with branch.<name>.remote, the upstream branch
>  	for the given branch. It tells 'git-fetch'/'git-pull' which
> -	branch to merge.
> +	branch to merge and can also afect 'git-push' (see push.default).

s/afect/affect/

>  	When in branch <name>, it tells 'git-fetch' the default
>  	refspec to be marked for merging in FETCH_HEAD. The value is
>  	handled like the remote part of a refspec, and must match a