From: Jonathan Nieder Date: Thu, 31 Jan 2013 20:04:34 GMT Subject: Re: [PATCH 2/7] Undocument deprecated alias 'push.default=tracking' Message-ID: <20130131200434.GI27340@google.com> In-Reply-To: <7vip6dgmx2.fsf@alter.siamese.dyndns.org> Junio C Hamano wrote: > For those who > want to _learn_ what possibilities are available to them (i.e. they > are not going from `tracking` to what it means, but going in the > opposite direction), it should be unmistakingly clear that > `tracking` is not a part of the choices they should make. Until pre-1.7.4 versions of git fall out of use, I don't agree that the above is true. :( > I do not > think the following list created by a simple "revert" makes it clear. > > * `nothing` - do not push anything. > * `matching` - push all branches having the same name in both ends. > * `upstream` - push the current branch to ... > * `simple` - like `upstream`, but refuses to ... > * `tracking` - deprecated synonym for `upstream`. > * `current` - push the current branch to a branch of the same name. How about the following? * `nothing` - ... * `matching` - ... * `upstream` - ... * `simple` - ... * `current` - ... For compatibility with ancient config files, the following synonym is also supported. Don't use it. * `tracking` - old name for `upstream`