Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > That's bad, either we shouldn't support it at all, or we should > document what it does. This patch does the latter.
I vaguely remember a similar discussion and probably even a patch in the past (maybe by you actually). I think the proposal was to add a mention of tracking but avoid promoting it at the same level as the others. I have a slight preference for a patch adding stg like "`tracking` is a deprecated alias supported only for backward compatibility" to the item of `upstream`, but I'm OK with the current patch too. > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -2344,6 +2344,10 @@ push.default:: > pushing to the same repository you would normally pull from > (i.e. central workflow). > > +* `tracking` - Deprecated synonym for `upstream`, which we still > + support for backwards compatibility with existing configuration > + files. Nit: I think the doc normally doesn't use "we" this way (we = the Git developers or the Git tool). Hence my s/which we still support/still supported/ above. -- Matthieu Moy http://www-verimag.imag.fr/~moy/
