Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > On Mon, Apr 23, 2012 at 10:37 AM, Matthieu Moy <matthieu....@imag.fr> wrote: >> It's been deprecated since 53c4031 (Johan Herland, Wed Feb 16 2011, >> push.default: Rename 'tracking' to 'upstream'), so it's OK to remove it >> from documentation (even though it's still supported) to make the >> explanations more readable. > > I don't think this was a good move for the documentation. Now every > time I find an old repo with "push.default=tracking" I end up > wondering what it was a synonym for again, and other users who don't > know what it does will just assume it's an invalid value or something. > > We can't treat existing config values we still support as any other > deprecated feature. They still exist in files we have no control over, > and in people's brains who are reading "man git-config" trying to > remember what it meant.
Wow, that's a blast from the past. I tend to agree that deprecating and removing are quite different, but a simple "revert" of the change would not be good, either. We still would want to _discourage_ its use. I think I can be persuaded to apply a patch that mentions 'tracking' as a side note. Thanks. > >> Signed-off-by: Matthieu Moy <matthieu....@imag.fr> >> --- >> Feel free to squash into previous one if needed. >> >> Documentation/config.txt | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/Documentation/config.txt b/Documentation/config.txt >> index e38fab1..ddf6043 100644 >> --- a/Documentation/config.txt >> +++ b/Documentation/config.txt >> @@ -1693,7 +1693,6 @@ push.default:: >> makes `git push` and `git pull` symmetrical in the sense that `push` >> will update the same remote ref as the one which is merged by >> `git pull`. >> -* `tracking` - deprecated synonym for `upstream`. >> * `current` - push the current branch to a branch of the same name. >> + >> The `current` and `upstream` modes are for those who want to >> -- >> 184.108.40.206.ge65dd.dirty >> >> -- >> 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 -- 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