Jonathan Nieder <jrnie...@gmail.com> writes:

> 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. :(

The documentation ships with the version that the above is true.  We
are not making an update to documentation that comes with ancient
versions.


>>                                                            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`

Didn't I say I am fine to mention it "as a side note" in the
original message you started responding to?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to