From: Jay Soffian <jaysoffian@gmail.com>
Date: Sun, 29 Mar 2009 01:38:42 GMT
Subject: Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}
Message-ID: <76718490903281838s1bc7e908l4702cf9ab020189@mail.gmail.com>
In-Reply-To: <1238281804-30290-2-git-send-email-santi@agolina.net>

On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
>  branch.<name>.merge::
> +       It defines, together with branch.<name>.remote, the tracking branch
> +       for the current branch. It tells 'git-fetch'/'git-pull' which
> +       branch to merge.

I think it would be clearer to say "the upstream branch for the
current branch", since
it could very well be a local branch, not necessarily a remote tracking branch.

j.