From: Santi Béjar Date: Mon, 30 Mar 2009 22:06:30 GMT Subject: Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push' Message-ID: In-Reply-To: <7vd4bzdkkq.fsf@gitster.siamese.dyndns.org> 2009/3/30 Junio C Hamano : > I'll take [1/4] and [2/4] with minor rewording, and I think [4/4] is not > necessary (push.default is clear enough---and defaultMode won't make it > any clearer to the first time readers anyway as it is unspecified what > kind of "mode" it is talking about). At least to me, mode in the context of 'push' suggest behavior. But maybe only for second time readers... > > I do not understand this [3/4].  I did look at push.default but it is > unclear how this variable is involved. > > Perhaps it is because the word "tracking" in the description "push the > current branch to the branch it is tracking" is used without explaination. 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. Santi