From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 Apr 2009 06:08:27 GMT
Subject: Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
Message-ID: <7v3acrk2p0.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <adf1fd3d0903301506r65bd9b9bv6bf76c652a051400@mail.gmail.com>

Santi Béjar <santi@agolina.net> writes:

> 2009/3/30 Junio C Hamano <gitster@pobox.com>:
> ...
> Maybe the push.default description needs some enhancements, but this
> [3/4] is true.
>
>> I think the author meant to say if your local branch frotz by default
>> merges changes made to the branch nitfol of the remote repository, "frotz
>> tracks nitfol", but the use of the word "track" for that meaning appears
>> nowhere in Documentation/glossary-content.txt
>
> So we can define:
>
> push.default = "tracking" = "push the current branch to its upstream branch"
>
> The "upstream branch" is defined in branch.name.merge and could also
> be added to glossary-content.

Sounds like a good plan.  Please make it so.